Don't use 'using std::error_code' in include/llvm.

This should make sure that most new uses use the std prefix.

llvm-svn: 210835

30 files changed, 30 insertions, 0 deletions

diff --git a/llvm/tools/bugpoint/ExecutionDriver.cpp b/llvm/tools/bugpoint/ExecutionDriver.cpp
index 5ed7d2cab3c..b41a4b03346 100644
--- a/llvm/tools/bugpoint/ExecutionDriver.cpp
+++ b/llvm/tools/bugpoint/ExecutionDriver.cpp
@@ -22,6 +22,7 @@
 #include <fstream>
 
 using namespace llvm;
+using std::error_code;
 
 namespace {
   // OutputType - Allow the user to specify the way code should be run, to test
diff --git a/llvm/tools/bugpoint/ExtractFunction.cpp b/llvm/tools/bugpoint/ExtractFunction.cpp
index 38cdf241ce7..a257840b6e0 100644
--- a/llvm/tools/bugpoint/ExtractFunction.cpp
+++ b/llvm/tools/bugpoint/ExtractFunction.cpp
@@ -33,6 +33,7 @@
 #include "llvm/Transforms/Utils/CodeExtractor.h"
 #include <set>
 using namespace llvm;
+using std::error_code;
 
 #define DEBUG_TYPE "bugpoint"
 
diff --git a/llvm/tools/bugpoint/Miscompilation.cpp b/llvm/tools/bugpoint/Miscompilation.cpp
index f5936ac88ea..5143fa1f037 100644
--- a/llvm/tools/bugpoint/Miscompilation.cpp
+++ b/llvm/tools/bugpoint/Miscompilation.cpp
@@ -27,6 +27,7 @@
 #include "llvm/Support/FileUtilities.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 using namespace llvm;
+using std::error_code;
 
 namespace llvm {
   extern cl::opt<std::string> OutputPrefix;
diff --git a/llvm/tools/bugpoint/OptimizerDriver.cpp b/llvm/tools/bugpoint/OptimizerDriver.cpp
index b2722e6d0e7..85790b0c631 100644
--- a/llvm/tools/bugpoint/OptimizerDriver.cpp
+++ b/llvm/tools/bugpoint/OptimizerDriver.cpp
@@ -35,6 +35,7 @@
 #include <fstream>
 
 using namespace llvm;
+using std::error_code;
 
 #define DEBUG_TYPE "bugpoint"
 
diff --git a/llvm/tools/bugpoint/ToolRunner.cpp b/llvm/tools/bugpoint/ToolRunner.cpp
index c481b03e2b9..ec120bb0b2f 100644
--- a/llvm/tools/bugpoint/ToolRunner.cpp
+++ b/llvm/tools/bugpoint/ToolRunner.cpp
@@ -22,6 +22,7 @@
 #include <fstream>
 #include <sstream>
 using namespace llvm;
+using std::error_code;
 
 #define DEBUG_TYPE "toolrunner"
 
diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp
index f6b3435e2fe..2030fbd6c83 100644
--- a/llvm/tools/gold/gold-plugin.cpp
+++ b/llvm/tools/gold/gold-plugin.cpp
@@ -44,6 +44,7 @@
 #endif
 
 using namespace llvm;
+using std::error_code;
 
 namespace {
   ld_plugin_status discard_message(int level, const char *format, ...) {
diff --git a/llvm/tools/lli/RemoteMemoryManager.cpp b/llvm/tools/lli/RemoteMemoryManager.cpp
index 200ab75152c..041f7c7afd0 100644
--- a/llvm/tools/lli/RemoteMemoryManager.cpp
+++ b/llvm/tools/lli/RemoteMemoryManager.cpp
@@ -19,6 +19,7 @@
 #include "llvm/Support/Format.h"
 
 using namespace llvm;
+using std::error_code;
 
 #define DEBUG_TYPE "lli"
 
diff --git a/llvm/tools/lli/lli.cpp b/llvm/tools/lli/lli.cpp
index 4cde10579c8..2c8a4749fdb 100644
--- a/llvm/tools/lli/lli.cpp
+++ b/llvm/tools/lli/lli.cpp
@@ -62,6 +62,7 @@
 #endif
 
 using namespace llvm;
+using std::error_code;
 
 #define DEBUG_TYPE "lli"
 
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp
index 47e8d8de16e..d0d4f1477da 100644
--- a/llvm/tools/llvm-ar/llvm-ar.cpp
+++ b/llvm/tools/llvm-ar/llvm-ar.cpp
@@ -36,6 +36,7 @@
 #endif
 
 using namespace llvm;
+using std::error_code;
 
 // The name this program was invoked as.
 static StringRef ToolName;
diff --git a/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp b/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
index d1c3525bb6a..d29c83714ab 100644
--- a/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
+++ b/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
@@ -43,6 +43,7 @@
 #include <map>
 #include <system_error>
 using namespace llvm;
+using std::error_code;
 
 static cl::opt<std::string>
   InputFilename(cl::Positional, cl::desc("<input bitcode>"), cl::init("-"));
diff --git a/llvm/tools/llvm-cov/llvm-cov.cpp b/llvm/tools/llvm-cov/llvm-cov.cpp
index 0917acd4110..97a91dd544a 100644
--- a/llvm/tools/llvm-cov/llvm-cov.cpp
+++ b/llvm/tools/llvm-cov/llvm-cov.cpp
@@ -22,6 +22,7 @@
 #include "llvm/Support/Signals.h"
 #include <system_error>
 using namespace llvm;
+using std::error_code;
 
 static cl::opt<std::string> SourceFile(cl::Positional, cl::Required,
                                        cl::desc("SOURCEFILE"));
diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp
index 3a3936934f0..f5dfedbc477 100644
--- a/llvm/tools/llvm-dis/llvm-dis.cpp
+++ b/llvm/tools/llvm-dis/llvm-dis.cpp
@@ -34,6 +34,7 @@
 #include "llvm/Support/ToolOutputFile.h"
 #include <system_error>
 using namespace llvm;
+using std::error_code;
 
 static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<input bitcode>"), cl::init("-"));
diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
index 1876362b77f..2f10f2994fa 100644
--- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
+++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
@@ -33,6 +33,7 @@
 
 using namespace llvm;
 using namespace object;
+using std::error_code;
 
 static cl::list<std::string>
 InputFilenames(cl::Positional, cl::desc("<input object files>"),
diff --git a/llvm/tools/llvm-mc/llvm-mc.cpp b/llvm/tools/llvm-mc/llvm-mc.cpp
index e5d38d2e27d..24a2d6f208e 100644
--- a/llvm/tools/llvm-mc/llvm-mc.cpp
+++ b/llvm/tools/llvm-mc/llvm-mc.cpp
@@ -40,6 +40,7 @@
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/ToolOutputFile.h"
 using namespace llvm;
+using std::error_code;
 
 static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"));
diff --git a/llvm/tools/llvm-mcmarkup/llvm-mcmarkup.cpp b/llvm/tools/llvm-mcmarkup/llvm-mcmarkup.cpp
index 7eb14d22a9d..e8416d60126 100644
--- a/llvm/tools/llvm-mcmarkup/llvm-mcmarkup.cpp
+++ b/llvm/tools/llvm-mcmarkup/llvm-mcmarkup.cpp
@@ -21,6 +21,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include <system_error>
 using namespace llvm;
+using std::error_code;
 
 static cl::list<std::string>
        InputFilenames(cl::Positional, cl::desc("<input files>"),
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
index ec7b29824b4..6476a60c7e1 100644
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -45,6 +45,7 @@
 #include <vector>
 using namespace llvm;
 using namespace object;
+using std::error_code;
 
 namespace {
 enum OutputFormatTy { bsd, sysv, posix, darwin };
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 974a83721e5..254c802aec4 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -64,6 +64,7 @@
 
 using namespace llvm;
 using namespace object;
+using std::error_code;
 
 static cl::list<std::string>
 InputFilenames(cl::Positional, cl::desc("<input object files>"),cl::ZeroOrMore);
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.h b/llvm/tools/llvm-objdump/llvm-objdump.h
index 30f2eea81f5..32a375b8ac3 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.h
+++ b/llvm/tools/llvm-objdump/llvm-objdump.h
@@ -16,6 +16,7 @@
 #include "llvm/Support/StringRefMemoryObject.h"
 
 namespace llvm {
+using std::error_code;
 
 namespace object {
   class COFFObjectFile;
diff --git a/llvm/tools/llvm-profdata/llvm-profdata.cpp b/llvm/tools/llvm-profdata/llvm-profdata.cpp
index fdde32ac6bb..9bf0897949f 100644
--- a/llvm/tools/llvm-profdata/llvm-profdata.cpp
+++ b/llvm/tools/llvm-profdata/llvm-profdata.cpp
@@ -24,6 +24,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
+using std::error_code;
 
 static void exitWithError(const Twine &Message, StringRef Whence = "") {
   errs() << "error: ";
diff --git a/llvm/tools/llvm-readobj/ARMEHABIPrinter.h b/llvm/tools/llvm-readobj/ARMEHABIPrinter.h
index 7608cfbbd8d..716c9a1a48e 100644
--- a/llvm/tools/llvm-readobj/ARMEHABIPrinter.h
+++ b/llvm/tools/llvm-readobj/ARMEHABIPrinter.h
@@ -22,6 +22,7 @@
 #include "llvm/Support/type_traits.h"
 
 namespace llvm {
+using std::error_code;
 namespace ARM {
 namespace EHABI {
 
diff --git a/llvm/tools/llvm-readobj/ARMWinEHPrinter.h b/llvm/tools/llvm-readobj/ARMWinEHPrinter.h
index eddcaf4d96f..e758bbf1247 100644
--- a/llvm/tools/llvm-readobj/ARMWinEHPrinter.h
+++ b/llvm/tools/llvm-readobj/ARMWinEHPrinter.h
@@ -15,6 +15,7 @@
 #include "llvm/Support/ErrorOr.h"
 
 namespace llvm {
+using std::error_code;
 namespace ARM {
 namespace WinEH {
 class RuntimeFunction;
diff --git a/llvm/tools/llvm-readobj/Win64EHDumper.cpp b/llvm/tools/llvm-readobj/Win64EHDumper.cpp
index c64d362469b..f3749fc36cc 100644
--- a/llvm/tools/llvm-readobj/Win64EHDumper.cpp
+++ b/llvm/tools/llvm-readobj/Win64EHDumper.cpp
@@ -16,6 +16,7 @@
 using namespace llvm;
 using namespace llvm::object;
 using namespace llvm::Win64EH;
+using std::error_code;
 
 static const EnumEntry<unsigned> UnwindFlags[] = {
   { "ExceptionHandler", UNW_ExceptionHandler },
diff --git a/llvm/tools/llvm-readobj/Win64EHDumper.h b/llvm/tools/llvm-readobj/Win64EHDumper.h
index 2eac81048b4..98055994aec 100644
--- a/llvm/tools/llvm-readobj/Win64EHDumper.h
+++ b/llvm/tools/llvm-readobj/Win64EHDumper.h
@@ -14,6 +14,7 @@
 #include "llvm/Support/Win64EH.h"
 
 namespace llvm {
+using std::error_code;
 namespace object {
 class COFFObjectFile;
 class SymbolRef;
diff --git a/llvm/tools/llvm-readobj/llvm-readobj.h b/llvm/tools/llvm-readobj/llvm-readobj.h
index 61ee0d4ed4f..920e74ccc9b 100644
--- a/llvm/tools/llvm-readobj/llvm-readobj.h
+++ b/llvm/tools/llvm-readobj/llvm-readobj.h
@@ -14,6 +14,7 @@
 #include <string>
 
 namespace llvm {
+using std::error_code;
   namespace object {
     class RelocationRef;
   }
diff --git a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
index df6d535c430..e86d93bd490 100644
--- a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
+++ b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
@@ -28,6 +28,7 @@
 #include <system_error>
 using namespace llvm;
 using namespace llvm::object;
+using std::error_code;
 
 static cl::list<std::string>
 InputFileList(cl::Positional, cl::ZeroOrMore,
diff --git a/llvm/tools/llvm-size/llvm-size.cpp b/llvm/tools/llvm-size/llvm-size.cpp
index ff3b88e3169..f0ec7fa6af6 100644
--- a/llvm/tools/llvm-size/llvm-size.cpp
+++ b/llvm/tools/llvm-size/llvm-size.cpp
@@ -30,6 +30,7 @@
 #include <system_error>
 using namespace llvm;
 using namespace object;
+using std::error_code;
 
 enum OutputFormatTy {berkeley, sysv};
 static cl::opt<OutputFormatTy>
diff --git a/llvm/tools/llvm-symbolizer/LLVMSymbolize.cpp b/llvm/tools/llvm-symbolizer/LLVMSymbolize.cpp
index 125e63f2254..61c4e8ad209 100644
--- a/llvm/tools/llvm-symbolizer/LLVMSymbolize.cpp
+++ b/llvm/tools/llvm-symbolizer/LLVMSymbolize.cpp
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 
 namespace llvm {
+using std::error_code;
 namespace symbolize {
 
 static bool error(error_code ec) {
diff --git a/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp b/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp
index 29db172531b..2ee30e816e4 100644
--- a/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp
+++ b/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp
@@ -29,6 +29,7 @@
 
 using namespace llvm;
 using namespace symbolize;
+using std::error_code;
 
 static cl::opt<bool>
 ClUseSymbolTable("use-symbol-table", cl::init(true),
diff --git a/llvm/tools/macho-dump/macho-dump.cpp b/llvm/tools/macho-dump/macho-dump.cpp
index e7575f0056f..13e8a4b80ca 100644
--- a/llvm/tools/macho-dump/macho-dump.cpp
+++ b/llvm/tools/macho-dump/macho-dump.cpp
@@ -23,6 +23,7 @@
 #include <system_error>
 using namespace llvm;
 using namespace llvm::object;
+using std::error_code;
 
 static cl::opt<std::string>
 InputFile(cl::Positional, cl::desc("<input file>"), cl::init("-"));
diff --git a/llvm/tools/obj2yaml/coff2yaml.cpp b/llvm/tools/obj2yaml/coff2yaml.cpp
index 42b09d312c2..816f9e65cde 100644
--- a/llvm/tools/obj2yaml/coff2yaml.cpp
+++ b/llvm/tools/obj2yaml/coff2yaml.cpp
@@ -14,6 +14,7 @@
 #include "llvm/Support/YAMLTraits.h"
 
 using namespace llvm;
+using std::error_code;
 
 namespace {