From a20bcb9969aa4f0d989e8f039d6af3a43357d310 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 13 Jun 2014 01:25:41 +0000 Subject: Remove all uses of 'using std::error_code' from headers. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210866 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-objdump/COFFDump.cpp | 1 + tools/llvm-objdump/MachODump.cpp | 1 + tools/llvm-objdump/llvm-objdump.h | 4 +--- tools/llvm-readobj/ARMEHABIPrinter.h | 1 - tools/llvm-readobj/ARMWinEHPrinter.cpp | 16 ++++++++-------- tools/llvm-readobj/ARMWinEHPrinter.h | 3 +-- tools/llvm-readobj/COFFDumper.cpp | 1 + tools/llvm-readobj/ELFDumper.cpp | 1 + tools/llvm-readobj/Error.h | 5 ++--- tools/llvm-readobj/MachODumper.cpp | 1 + tools/llvm-readobj/ObjDumper.h | 17 +++++++++-------- tools/llvm-readobj/Win64EHDumper.h | 6 +++--- tools/llvm-readobj/llvm-readobj.cpp | 1 + tools/llvm-readobj/llvm-readobj.h | 3 +-- tools/obj2yaml/Error.h | 5 ++--- tools/obj2yaml/elf2yaml.cpp | 1 + tools/obj2yaml/obj2yaml.cpp | 1 + 17 files changed, 35 insertions(+), 33 deletions(-) (limited to 'tools') diff --git a/tools/llvm-objdump/COFFDump.cpp b/tools/llvm-objdump/COFFDump.cpp index 7a0fa6e151..84799ec8b0 100644 --- a/tools/llvm-objdump/COFFDump.cpp +++ b/tools/llvm-objdump/COFFDump.cpp @@ -29,6 +29,7 @@ using namespace llvm; using namespace object; using namespace llvm::Win64EH; +using std::error_code; // Returns the name of the unwind code. static StringRef getUnwindCodeTypeName(uint8_t Code) { diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp index eaad96cc78..cba7318354 100644 --- a/tools/llvm-objdump/MachODump.cpp +++ b/tools/llvm-objdump/MachODump.cpp @@ -42,6 +42,7 @@ #include using namespace llvm; using namespace object; +using std::error_code; static cl::opt UseDbg("g", cl::desc("Print line information from debug info if available")); diff --git a/tools/llvm-objdump/llvm-objdump.h b/tools/llvm-objdump/llvm-objdump.h index 32a375b8ac..80f8f581a8 100644 --- a/tools/llvm-objdump/llvm-objdump.h +++ b/tools/llvm-objdump/llvm-objdump.h @@ -16,8 +16,6 @@ #include "llvm/Support/StringRefMemoryObject.h" namespace llvm { -using std::error_code; - namespace object { class COFFObjectFile; class ObjectFile; @@ -28,7 +26,7 @@ extern cl::opt TripleName; extern cl::opt ArchName; // Various helper functions. -bool error(error_code ec); +bool error(std::error_code ec); bool RelocAddressLess(object::RelocationRef a, object::RelocationRef b); void DumpBytes(StringRef bytes); void DisassembleInputMachO(StringRef Filename); diff --git a/tools/llvm-readobj/ARMEHABIPrinter.h b/tools/llvm-readobj/ARMEHABIPrinter.h index 716c9a1a48..7608cfbbd8 100644 --- a/tools/llvm-readobj/ARMEHABIPrinter.h +++ b/tools/llvm-readobj/ARMEHABIPrinter.h @@ -22,7 +22,6 @@ #include "llvm/Support/type_traits.h" namespace llvm { -using std::error_code; namespace ARM { namespace EHABI { diff --git a/tools/llvm-readobj/ARMWinEHPrinter.cpp b/tools/llvm-readobj/ARMWinEHPrinter.cpp index d82b847a35..f6675bdcfe 100644 --- a/tools/llvm-readobj/ARMWinEHPrinter.cpp +++ b/tools/llvm-readobj/ARMWinEHPrinter.cpp @@ -189,9 +189,9 @@ Decoder::getSectionContaining(const COFFObjectFile &COFF, uint64_t VA) { uint64_t Address; uint64_t Size; - if (error_code EC = Section.getAddress(Address)) + if (std::error_code EC = Section.getAddress(Address)) return EC; - if (error_code EC = Section.getSize(Size)) + if (std::error_code EC = Section.getSize(Size)) return EC; if (VA >= Address && (VA - Address) <= Size) @@ -205,14 +205,14 @@ ErrorOr Decoder::getSymbol(const COFFObjectFile &COFF, for (const auto &Symbol : COFF.symbols()) { if (FunctionOnly) { SymbolRef::Type Type; - if (error_code EC = Symbol.getType(Type)) + if (std::error_code EC = Symbol.getType(Type)) return EC; if (Type != SymbolRef::ST_Function) continue; } uint64_t Address; - if (error_code EC = Symbol.getAddress(Address)) + if (std::error_code EC = Symbol.getAddress(Address)) return EC; if (Address == VA) return Symbol; @@ -728,17 +728,17 @@ void Decoder::dumpProcedureData(const COFFObjectFile &COFF, break; } -error_code Decoder::dumpProcedureData(const COFFObjectFile &COFF) { +std::error_code Decoder::dumpProcedureData(const COFFObjectFile &COFF) { for (const auto &Section : COFF.sections()) { StringRef SectionName; - if (error_code EC = COFF.getSectionName(COFF.getCOFFSection(Section), - SectionName)) + if (std::error_code EC = + COFF.getSectionName(COFF.getCOFFSection(Section), SectionName)) return EC; if (SectionName.startswith(".pdata")) dumpProcedureData(COFF, Section); } - return error_code(); + return std::error_code(); } } } diff --git a/tools/llvm-readobj/ARMWinEHPrinter.h b/tools/llvm-readobj/ARMWinEHPrinter.h index e758bbf124..740c8b5841 100644 --- a/tools/llvm-readobj/ARMWinEHPrinter.h +++ b/tools/llvm-readobj/ARMWinEHPrinter.h @@ -15,7 +15,6 @@ #include "llvm/Support/ErrorOr.h" namespace llvm { -using std::error_code; namespace ARM { namespace WinEH { class RuntimeFunction; @@ -110,7 +109,7 @@ class Decoder { public: Decoder(StreamWriter &SW) : SW(SW), OS(SW.getOStream()) {} - error_code dumpProcedureData(const object::COFFObjectFile &COFF); + std::error_code dumpProcedureData(const object::COFFObjectFile &COFF); }; } } diff --git a/tools/llvm-readobj/COFFDumper.cpp b/tools/llvm-readobj/COFFDumper.cpp index 77289484cf..0a14c42fe3 100644 --- a/tools/llvm-readobj/COFFDumper.cpp +++ b/tools/llvm-readobj/COFFDumper.cpp @@ -38,6 +38,7 @@ using namespace llvm; using namespace llvm::object; using namespace llvm::Win64EH; +using std::error_code; namespace { diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp index 0a69915ac8..8ec59bec00 100644 --- a/tools/llvm-readobj/ELFDumper.cpp +++ b/tools/llvm-readobj/ELFDumper.cpp @@ -30,6 +30,7 @@ using namespace llvm; using namespace llvm::object; using namespace ELF; +using std::error_code; #define LLVM_READOBJ_ENUM_CASE(ns, enum) \ case ns::enum: return #enum; diff --git a/tools/llvm-readobj/Error.h b/tools/llvm-readobj/Error.h index b9b7e526b9..81ce4082aa 100644 --- a/tools/llvm-readobj/Error.h +++ b/tools/llvm-readobj/Error.h @@ -17,7 +17,6 @@ #include namespace llvm { -using std::error_code; const std::error_category &readobj_category(); enum class readobj_error { @@ -29,8 +28,8 @@ enum class readobj_error { unknown_symbol }; -inline error_code make_error_code(readobj_error e) { - return error_code(static_cast(e), readobj_category()); +inline std::error_code make_error_code(readobj_error e) { + return std::error_code(static_cast(e), readobj_category()); } } // namespace llvm diff --git a/tools/llvm-readobj/MachODumper.cpp b/tools/llvm-readobj/MachODumper.cpp index 2fd5d4acaa..0c31bec993 100644 --- a/tools/llvm-readobj/MachODumper.cpp +++ b/tools/llvm-readobj/MachODumper.cpp @@ -21,6 +21,7 @@ using namespace llvm; using namespace object; +using std::error_code; namespace { diff --git a/tools/llvm-readobj/ObjDumper.h b/tools/llvm-readobj/ObjDumper.h index 3e8194bffe..795193327b 100644 --- a/tools/llvm-readobj/ObjDumper.h +++ b/tools/llvm-readobj/ObjDumper.h @@ -14,7 +14,6 @@ #include namespace llvm { -using std::error_code; namespace object { class ObjectFile; } @@ -45,15 +44,17 @@ protected: StreamWriter& W; }; -error_code createCOFFDumper(const object::ObjectFile *Obj, StreamWriter &Writer, - std::unique_ptr &Result); +std::error_code createCOFFDumper(const object::ObjectFile *Obj, + StreamWriter &Writer, + std::unique_ptr &Result); -error_code createELFDumper(const object::ObjectFile *Obj, StreamWriter &Writer, - std::unique_ptr &Result); +std::error_code createELFDumper(const object::ObjectFile *Obj, + StreamWriter &Writer, + std::unique_ptr &Result); -error_code createMachODumper(const object::ObjectFile *Obj, - StreamWriter &Writer, - std::unique_ptr &Result); +std::error_code createMachODumper(const object::ObjectFile *Obj, + StreamWriter &Writer, + std::unique_ptr &Result); } // namespace llvm diff --git a/tools/llvm-readobj/Win64EHDumper.h b/tools/llvm-readobj/Win64EHDumper.h index 98055994ae..9ce4d39a69 100644 --- a/tools/llvm-readobj/Win64EHDumper.h +++ b/tools/llvm-readobj/Win64EHDumper.h @@ -14,7 +14,6 @@ #include "llvm/Support/Win64EH.h" namespace llvm { -using std::error_code; namespace object { class COFFObjectFile; class SymbolRef; @@ -27,8 +26,9 @@ class Dumper { raw_ostream &OS; public: - typedef error_code (*SymbolResolver)(const object::coff_section *, uint64_t, - object::SymbolRef &, void *); + typedef std::error_code (*SymbolResolver)(const object::coff_section *, + uint64_t, object::SymbolRef &, + void *); struct Context { const object::COFFObjectFile &COFF; diff --git a/tools/llvm-readobj/llvm-readobj.cpp b/tools/llvm-readobj/llvm-readobj.cpp index 900f17b3c1..70af4dc4cb 100644 --- a/tools/llvm-readobj/llvm-readobj.cpp +++ b/tools/llvm-readobj/llvm-readobj.cpp @@ -41,6 +41,7 @@ using namespace llvm; using namespace llvm::object; +using std::error_code; namespace opts { cl::list InputFilenames(cl::Positional, diff --git a/tools/llvm-readobj/llvm-readobj.h b/tools/llvm-readobj/llvm-readobj.h index 920e74ccc9..033195c1d4 100644 --- a/tools/llvm-readobj/llvm-readobj.h +++ b/tools/llvm-readobj/llvm-readobj.h @@ -14,13 +14,12 @@ #include namespace llvm { -using std::error_code; namespace object { class RelocationRef; } // Various helper functions. - bool error(error_code ec); + bool error(std::error_code ec); bool relocAddressLess(object::RelocationRef A, object::RelocationRef B); } // namespace llvm diff --git a/tools/obj2yaml/Error.h b/tools/obj2yaml/Error.h index b91bfbb33c..4657f0db52 100644 --- a/tools/obj2yaml/Error.h +++ b/tools/obj2yaml/Error.h @@ -13,7 +13,6 @@ #include namespace llvm { -using std::error_code; const std::error_category &obj2yaml_category(); enum class obj2yaml_error { @@ -23,8 +22,8 @@ enum class obj2yaml_error { unsupported_obj_file_format }; -inline error_code make_error_code(obj2yaml_error e) { - return error_code(static_cast(e), obj2yaml_category()); +inline std::error_code make_error_code(obj2yaml_error e) { + return std::error_code(static_cast(e), obj2yaml_category()); } } // namespace llvm diff --git a/tools/obj2yaml/elf2yaml.cpp b/tools/obj2yaml/elf2yaml.cpp index 317c6eb3e6..a20ad6f3e2 100644 --- a/tools/obj2yaml/elf2yaml.cpp +++ b/tools/obj2yaml/elf2yaml.cpp @@ -16,6 +16,7 @@ #include "llvm/Support/YAMLTraits.h" using namespace llvm; +using std::error_code; namespace { diff --git a/tools/obj2yaml/obj2yaml.cpp b/tools/obj2yaml/obj2yaml.cpp index 7fe034d5b4..717c68d1c6 100644 --- a/tools/obj2yaml/obj2yaml.cpp +++ b/tools/obj2yaml/obj2yaml.cpp @@ -18,6 +18,7 @@ using namespace llvm; using namespace llvm::object; +using std::error_code; static error_code dumpObject(const ObjectFile &Obj) { if (Obj.isCOFF()) -- cgit v1.2.3