Remove all uses of 'using std::error_code' from headers.
llvm-svn: 210866
diff --git a/llvm/tools/llvm-objdump/COFFDump.cpp b/llvm/tools/llvm-objdump/COFFDump.cpp
index 7a0fa6e1..84799ec 100644
--- a/llvm/tools/llvm-objdump/COFFDump.cpp
+++ b/llvm/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/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index eaad96c..cba7318 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/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/llvm/tools/llvm-objdump/llvm-objdump.h b/llvm/tools/llvm-objdump/llvm-objdump.h
index 32a375b..80f8f58 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.h
+++ b/llvm/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> 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/llvm/tools/llvm-readobj/ARMEHABIPrinter.h b/llvm/tools/llvm-readobj/ARMEHABIPrinter.h
index 716c9a1..7608cfb 100644
--- a/llvm/tools/llvm-readobj/ARMEHABIPrinter.h
+++ b/llvm/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/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp b/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp
index d82b847..f6675bd 100644
--- a/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp
+++ b/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp
@@ -189,9 +189,9 @@
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 @@
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 @@
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/llvm/tools/llvm-readobj/ARMWinEHPrinter.h b/llvm/tools/llvm-readobj/ARMWinEHPrinter.h
index e758bbf..740c8b5 100644
--- a/llvm/tools/llvm-readobj/ARMWinEHPrinter.h
+++ b/llvm/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 @@
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/llvm/tools/llvm-readobj/COFFDumper.cpp b/llvm/tools/llvm-readobj/COFFDumper.cpp
index 7728948..0a14c42 100644
--- a/llvm/tools/llvm-readobj/COFFDumper.cpp
+++ b/llvm/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/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 0a69915..8ec59be 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/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/llvm/tools/llvm-readobj/Error.h b/llvm/tools/llvm-readobj/Error.h
index b9b7e52..81ce408 100644
--- a/llvm/tools/llvm-readobj/Error.h
+++ b/llvm/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 @@
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/llvm/tools/llvm-readobj/MachODumper.cpp b/llvm/tools/llvm-readobj/MachODumper.cpp
index 2fd5d4a..0c31bec 100644
--- a/llvm/tools/llvm-readobj/MachODumper.cpp
+++ b/llvm/tools/llvm-readobj/MachODumper.cpp
@@ -21,6 +21,7 @@
using namespace llvm;
using namespace object;
+using std::error_code;
namespace {
diff --git a/llvm/tools/llvm-readobj/ObjDumper.h b/llvm/tools/llvm-readobj/ObjDumper.h
index 3e8194b..7951933 100644
--- a/llvm/tools/llvm-readobj/ObjDumper.h
+++ b/llvm/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 @@
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/llvm/tools/llvm-readobj/Win64EHDumper.h b/llvm/tools/llvm-readobj/Win64EHDumper.h
index 9805599..9ce4d39 100644
--- a/llvm/tools/llvm-readobj/Win64EHDumper.h
+++ b/llvm/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 @@
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/llvm/tools/llvm-readobj/llvm-readobj.cpp b/llvm/tools/llvm-readobj/llvm-readobj.cpp
index 900f17b..70af4dc 100644
--- a/llvm/tools/llvm-readobj/llvm-readobj.cpp
+++ b/llvm/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/llvm/tools/llvm-readobj/llvm-readobj.h b/llvm/tools/llvm-readobj/llvm-readobj.h
index 920e74c..033195c 100644
--- a/llvm/tools/llvm-readobj/llvm-readobj.h
+++ b/llvm/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/llvm/tools/obj2yaml/Error.h b/llvm/tools/obj2yaml/Error.h
index b91bfbb..4657f0d 100644
--- a/llvm/tools/obj2yaml/Error.h
+++ b/llvm/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 @@
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/llvm/tools/obj2yaml/elf2yaml.cpp b/llvm/tools/obj2yaml/elf2yaml.cpp
index 317c6eb..a20ad6f 100644
--- a/llvm/tools/obj2yaml/elf2yaml.cpp
+++ b/llvm/tools/obj2yaml/elf2yaml.cpp
@@ -16,6 +16,7 @@
#include "llvm/Support/YAMLTraits.h"
using namespace llvm;
+using std::error_code;
namespace {
diff --git a/llvm/tools/obj2yaml/obj2yaml.cpp b/llvm/tools/obj2yaml/obj2yaml.cpp
index 7fe034d..717c68d 100644
--- a/llvm/tools/obj2yaml/obj2yaml.cpp
+++ b/llvm/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())