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

diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index a5eec0f70d40370cb7fe192b686b3dba5a1d1dd1..cafdd12529af171b2c296f20cab0949bf50b4ad1 100644 (file)
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -26,6 +26,7 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
+using std::error_code;
 
 enum {
   SWITCH_INST_MAGIC = 0x4B5 // May 2012 => 1205 => Hex

diff --git a/lib/Bitcode/Reader/BitcodeReader.h b/lib/Bitcode/Reader/BitcodeReader.h
index 7a1b3f2d037a744b5af235f311a293ba8602290c..36849d4045413652f3d9c6f1861901c1fe6b2ec7 100644 (file)
--- a/lib/Bitcode/Reader/BitcodeReader.h
+++ b/lib/Bitcode/Reader/BitcodeReader.h
@@ -26,7 +26,6 @@
 #include <vector>
 
 namespace llvm {
-using std::error_code;
   class MemoryBuffer;
   class LLVMContext;
 
@@ -220,8 +219,8 @@ public:
     InvalidValue // Invalid version, inst number, attr number, etc
   };
 
-  error_code Error(ErrorType E) {
-    return error_code(E, BitcodeErrorCategory());
+  std::error_code Error(ErrorType E) {
+    return std::error_code(E, BitcodeErrorCategory());
   }
 
   explicit BitcodeReader(MemoryBuffer *buffer, LLVMContext &C)
@@ -250,17 +249,17 @@ public:
 
   bool isMaterializable(const GlobalValue *GV) const override;
   bool isDematerializable(const GlobalValue *GV) const override;
-  error_code Materialize(GlobalValue *GV) override;
-  error_code MaterializeModule(Module *M) override;
+  std::error_code Materialize(GlobalValue *GV) override;
+  std::error_code MaterializeModule(Module *M) override;
   void Dematerialize(GlobalValue *GV) override;
 
   /// @brief Main interface to parsing a bitcode buffer.
   /// @returns true if an error occurred.
-  error_code ParseBitcodeInto(Module *M);
+  std::error_code ParseBitcodeInto(Module *M);
 
   /// @brief Cheap mechanism to just extract module triple
   /// @returns true if an error occurred.
-  error_code ParseTriple(std::string &Triple);
+  std::error_code ParseTriple(std::string &Triple);
 
   static uint64_t decodeSignRotatedValue(uint64_t V);
 
@@ -347,28 +346,29 @@ private:
     return getFnValueByID(ValNo, Ty);
   }
 
-  error_code ParseAttrKind(uint64_t Code, Attribute::AttrKind *Kind);
-  error_code ParseModule(bool Resume);
-  error_code ParseAttributeBlock();
-  error_code ParseAttributeGroupBlock();
-  error_code ParseTypeTable();
-  error_code ParseTypeTableBody();
-
-  error_code ParseValueSymbolTable();
-  error_code ParseConstants();
-  error_code RememberAndSkipFunctionBody();
-  error_code ParseFunctionBody(Function *F);
-  error_code GlobalCleanup();
-  error_code ResolveGlobalAndAliasInits();
-  error_code ParseMetadata();
-  error_code ParseMetadataAttachment();
-  error_code ParseModuleTriple(std::string &Triple);
-  error_code ParseUseLists();
-  error_code InitStream();
-  error_code InitStreamFromBuffer();
-  error_code InitLazyStream();
-  error_code FindFunctionInStream(Function *F,
-         DenseMap<Function*, uint64_t>::iterator DeferredFunctionInfoIterator);
+  std::error_code ParseAttrKind(uint64_t Code, Attribute::AttrKind *Kind);
+  std::error_code ParseModule(bool Resume);
+  std::error_code ParseAttributeBlock();
+  std::error_code ParseAttributeGroupBlock();
+  std::error_code ParseTypeTable();
+  std::error_code ParseTypeTableBody();
+
+  std::error_code ParseValueSymbolTable();
+  std::error_code ParseConstants();
+  std::error_code RememberAndSkipFunctionBody();
+  std::error_code ParseFunctionBody(Function *F);
+  std::error_code GlobalCleanup();
+  std::error_code ResolveGlobalAndAliasInits();
+  std::error_code ParseMetadata();
+  std::error_code ParseMetadataAttachment();
+  std::error_code ParseModuleTriple(std::string &Triple);
+  std::error_code ParseUseLists();
+  std::error_code InitStream();
+  std::error_code InitStreamFromBuffer();
+  std::error_code InitLazyStream();
+  std::error_code FindFunctionInStream(
+      Function *F,
+      DenseMap<Function *, uint64_t>::iterator DeferredFunctionInfoIterator);
 };
 
 } // End llvm namespace

diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
index c1eb0fd31f369ce079a63280753aaec635960295..b1558c029fef913c3b1b15db17079adf98a92a3b 100644 (file)
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -23,6 +23,7 @@
 
 using namespace llvm;
 using namespace llvm::object;
+using std::error_code;
 
 #define DEBUG_TYPE "dyld"
 

diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
index 6ba24b9b59714a9192673f451597a1316174af3d..ec825b82ee49729f3b9db2cc5a79479a66b54fc8 100644 (file)
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
@@ -27,6 +27,7 @@
 
 using namespace llvm;
 using namespace llvm::object;
+using std::error_code;
 
 #define DEBUG_TYPE "dyld"
 

diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h
index 53cf8f99ffb9af9f46a48dea0b0a9f52d0c45b5d..b84883310b4f9bf6393f80ecabb34c33f388e5e2 100644 (file)
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h
@@ -20,11 +20,9 @@
 using namespace llvm;
 
 namespace llvm {
-using std::error_code;
-
 namespace {
 // Helper for extensive error checking in debug builds.
-error_code Check(error_code Err) {
+std::error_code Check(std::error_code Err) {
   if (Err) {
     report_fatal_error(Err.message());
   }

diff --git a/tools/llvm-objdump/COFFDump.cpp b/tools/llvm-objdump/COFFDump.cpp
index 7a0fa6e151b1246b18b9f40179f60a26ac3190ba..84799ec8b004fd66fd0eca78d4acff85241c52f7 100644 (file)
--- 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 eaad96cc78fe57b4f11fc9169790ab66412c9e6d..cba731835465ae307f499bada87a4b15342bb0f0 100644 (file)
--- a/tools/llvm-objdump/MachODump.cpp
+++ b/tools/llvm-objdump/MachODump.cpp
@@ -42,6 +42,7 @@
 #include <system_error>
 using namespace llvm;
 using namespace object;
+using std::error_code;
 
 static cl::opt<bool>
   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 32a375b8ac3cc19c5e410bc33f7fb6a0602db6b3..80f8f581a880e3c61664eaa39cbcb4dfb97ed52c 100644 (file)
--- 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<std::string> TripleName;
 extern cl::opt<std::string> 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 716c9a1a48e99a1c27f9733b112dbbb9f15bdb15..7608cfbbd8d103f3492afbee94fba76e2c863da2 100644 (file)
--- 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 d82b847a357f84d8f19a514d1901d908f3c879a4..f6675bdcfedf1d6d19b057e2eb442549fd5ed070 100644 (file)
--- 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<object::SymbolRef> 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 e758bbf124785b5356c74e4607e1a6d990d94f10..740c8b5841b5c32d73c07c791ff58b78febee5af 100644 (file)
--- 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 77289484cf895b50e95da87f14b756eb006eb6cb..0a14c42fe3215402ae3371577744c968bc885800 100644 (file)
--- 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 0a69915ac8298bbf50c8af8fde04ab8ca1a9918f..8ec59bec008cede36159d13ea4df0b4619eaa345 100644 (file)
--- 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 b9b7e526b9e84a4e7b60715d121a3e5b4c5ed515..81ce4082aab957be65ab4021486062d903615fdd 100644 (file)
--- a/tools/llvm-readobj/Error.h
+++ b/tools/llvm-readobj/Error.h
@@ -17,7 +17,6 @@
 #include <system_error>
 
 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<int>(e), readobj_category());
+inline std::error_code make_error_code(readobj_error e) {
+  return std::error_code(static_cast<int>(e), readobj_category());
 }
 
 } // namespace llvm

diff --git a/tools/llvm-readobj/MachODumper.cpp b/tools/llvm-readobj/MachODumper.cpp
index 2fd5d4acaa844afd5f6981deff8387cc2607e0b1..0c31bec993da6bee0059d13c0e05e967f00949ac 100644 (file)
--- 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 3e8194bffed0da73740262f9553bdcd03c0ab947..795193327bc5c77cdc73dd025d82065b49859304 100644 (file)
--- a/tools/llvm-readobj/ObjDumper.h
+++ b/tools/llvm-readobj/ObjDumper.h
@@ -14,7 +14,6 @@
 #include <system_error>
 
 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<ObjDumper> &Result);
+std::error_code createCOFFDumper(const object::ObjectFile *Obj,
+                                 StreamWriter &Writer,
+                                 std::unique_ptr<ObjDumper> &Result);
 
-error_code createELFDumper(const object::ObjectFile *Obj, StreamWriter &Writer,
-                           std::unique_ptr<ObjDumper> &Result);
+std::error_code createELFDumper(const object::ObjectFile *Obj,
+                                StreamWriter &Writer,
+                                std::unique_ptr<ObjDumper> &Result);
 
-error_code createMachODumper(const object::ObjectFile *Obj,
-                             StreamWriter &Writer,
-                             std::unique_ptr<ObjDumper> &Result);
+std::error_code createMachODumper(const object::ObjectFile *Obj,
+                                  StreamWriter &Writer,
+                                  std::unique_ptr<ObjDumper> &Result);
 
 } // namespace llvm
 

diff --git a/tools/llvm-readobj/Win64EHDumper.h b/tools/llvm-readobj/Win64EHDumper.h
index 98055994aecf28ae160dbace325a6c5e14167fdf..9ce4d39a6912eff820ee1bf08ce09ad3498def7e 100644 (file)
--- 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 900f17b3c1487635a9f2e72d1c9498f2d21e00b2..70af4dc4cb4c84a94fce9c8917d62475b71eff6d 100644 (file)
--- 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<std::string> InputFilenames(cl::Positional,

diff --git a/tools/llvm-readobj/llvm-readobj.h b/tools/llvm-readobj/llvm-readobj.h
index 920e74ccc9b0ba9fb3d35ec7a65c2b2e4427f690..033195c1d49be3bcfa5a12588487890eb671ca13 100644 (file)
--- a/tools/llvm-readobj/llvm-readobj.h
+++ b/tools/llvm-readobj/llvm-readobj.h
@@ -14,13 +14,12 @@
 #include <string>
 
 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 b91bfbb33c095879fee52ecffa0a88e1c7ee2161..4657f0db528237b3427d6e2db5a45a891b8e3689 100644 (file)
--- a/tools/obj2yaml/Error.h
+++ b/tools/obj2yaml/Error.h
@@ -13,7 +13,6 @@
 #include <system_error>
 
 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<int>(e), obj2yaml_category());
+inline std::error_code make_error_code(obj2yaml_error e) {
+  return std::error_code(static_cast<int>(e), obj2yaml_category());
 }
 
 } // namespace llvm

diff --git a/tools/obj2yaml/elf2yaml.cpp b/tools/obj2yaml/elf2yaml.cpp
index 317c6eb3e6730dab6aa6e6cb6bfad2e002a21d91..a20ad6f3e2c599603f1bf05f95ef9ba8cb81f26c 100644 (file)
--- 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 7fe034d5b4912bb5ab3add12635dfea59d9899ad..717c68d1c63f11eb9abce62c243a8fb8bf042dc4 100644 (file)
--- 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())