From 5c792faa0e5560bc148c973f3df658eb3bb2061e Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 12 Jun 2014 21:46:39 +0000 Subject: Don't use 'using std::error_code' in include/llvm. This should make sure that most new uses use the std prefix. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210835 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/bugpoint/ExecutionDriver.cpp | 1 + tools/bugpoint/ExtractFunction.cpp | 1 + tools/bugpoint/Miscompilation.cpp | 1 + tools/bugpoint/OptimizerDriver.cpp | 1 + tools/bugpoint/ToolRunner.cpp | 1 + tools/gold/gold-plugin.cpp | 1 + tools/lli/RemoteMemoryManager.cpp | 1 + tools/lli/lli.cpp | 1 + tools/llvm-ar/llvm-ar.cpp | 1 + tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp | 1 + tools/llvm-cov/llvm-cov.cpp | 1 + tools/llvm-dis/llvm-dis.cpp | 1 + tools/llvm-dwarfdump/llvm-dwarfdump.cpp | 1 + tools/llvm-mc/llvm-mc.cpp | 1 + tools/llvm-mcmarkup/llvm-mcmarkup.cpp | 1 + tools/llvm-nm/llvm-nm.cpp | 1 + tools/llvm-objdump/llvm-objdump.cpp | 1 + tools/llvm-objdump/llvm-objdump.h | 1 + tools/llvm-profdata/llvm-profdata.cpp | 1 + tools/llvm-readobj/ARMEHABIPrinter.h | 1 + tools/llvm-readobj/ARMWinEHPrinter.h | 1 + tools/llvm-readobj/Win64EHDumper.cpp | 1 + tools/llvm-readobj/Win64EHDumper.h | 1 + tools/llvm-readobj/llvm-readobj.h | 1 + tools/llvm-rtdyld/llvm-rtdyld.cpp | 1 + tools/llvm-size/llvm-size.cpp | 1 + tools/llvm-symbolizer/LLVMSymbolize.cpp | 1 + tools/llvm-symbolizer/llvm-symbolizer.cpp | 1 + tools/macho-dump/macho-dump.cpp | 1 + tools/obj2yaml/coff2yaml.cpp | 1 + 30 files changed, 30 insertions(+) (limited to 'tools') diff --git a/tools/bugpoint/ExecutionDriver.cpp b/tools/bugpoint/ExecutionDriver.cpp index 5ed7d2cab3..b41a4b0334 100644 --- a/tools/bugpoint/ExecutionDriver.cpp +++ b/tools/bugpoint/ExecutionDriver.cpp @@ -22,6 +22,7 @@ #include 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/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp index 38cdf241ce..a257840b6e 100644 --- a/tools/bugpoint/ExtractFunction.cpp +++ b/tools/bugpoint/ExtractFunction.cpp @@ -33,6 +33,7 @@ #include "llvm/Transforms/Utils/CodeExtractor.h" #include using namespace llvm; +using std::error_code; #define DEBUG_TYPE "bugpoint" diff --git a/tools/bugpoint/Miscompilation.cpp b/tools/bugpoint/Miscompilation.cpp index f5936ac88e..5143fa1f03 100644 --- a/tools/bugpoint/Miscompilation.cpp +++ b/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 OutputPrefix; diff --git a/tools/bugpoint/OptimizerDriver.cpp b/tools/bugpoint/OptimizerDriver.cpp index b2722e6d0e..85790b0c63 100644 --- a/tools/bugpoint/OptimizerDriver.cpp +++ b/tools/bugpoint/OptimizerDriver.cpp @@ -35,6 +35,7 @@ #include using namespace llvm; +using std::error_code; #define DEBUG_TYPE "bugpoint" diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp index c481b03e2b..ec120bb0b2 100644 --- a/tools/bugpoint/ToolRunner.cpp +++ b/tools/bugpoint/ToolRunner.cpp @@ -22,6 +22,7 @@ #include #include using namespace llvm; +using std::error_code; #define DEBUG_TYPE "toolrunner" diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp index f6b3435e2f..2030fbd6c8 100644 --- a/tools/gold/gold-plugin.cpp +++ b/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/tools/lli/RemoteMemoryManager.cpp b/tools/lli/RemoteMemoryManager.cpp index 200ab75152..041f7c7afd 100644 --- a/tools/lli/RemoteMemoryManager.cpp +++ b/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/tools/lli/lli.cpp b/tools/lli/lli.cpp index 4cde10579c..2c8a4749fd 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -62,6 +62,7 @@ #endif using namespace llvm; +using std::error_code; #define DEBUG_TYPE "lli" diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 47e8d8de16..d0d4f1477d 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/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/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp b/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp index d1c3525bb6..d29c83714a 100644 --- a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp +++ b/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp @@ -43,6 +43,7 @@ #include #include using namespace llvm; +using std::error_code; static cl::opt InputFilename(cl::Positional, cl::desc(""), cl::init("-")); diff --git a/tools/llvm-cov/llvm-cov.cpp b/tools/llvm-cov/llvm-cov.cpp index 0917acd411..97a91dd544 100644 --- a/tools/llvm-cov/llvm-cov.cpp +++ b/tools/llvm-cov/llvm-cov.cpp @@ -22,6 +22,7 @@ #include "llvm/Support/Signals.h" #include using namespace llvm; +using std::error_code; static cl::opt SourceFile(cl::Positional, cl::Required, cl::desc("SOURCEFILE")); diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp index 3a3936934f..f5dfedbc47 100644 --- a/tools/llvm-dis/llvm-dis.cpp +++ b/tools/llvm-dis/llvm-dis.cpp @@ -34,6 +34,7 @@ #include "llvm/Support/ToolOutputFile.h" #include using namespace llvm; +using std::error_code; static cl::opt InputFilename(cl::Positional, cl::desc(""), cl::init("-")); diff --git a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp index 1876362b77..2f10f2994f 100644 --- a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp +++ b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp @@ -33,6 +33,7 @@ using namespace llvm; using namespace object; +using std::error_code; static cl::list InputFilenames(cl::Positional, cl::desc(""), diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp index e5d38d2e27..24a2d6f208 100644 --- a/tools/llvm-mc/llvm-mc.cpp +++ b/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 InputFilename(cl::Positional, cl::desc(""), cl::init("-")); diff --git a/tools/llvm-mcmarkup/llvm-mcmarkup.cpp b/tools/llvm-mcmarkup/llvm-mcmarkup.cpp index 7eb14d22a9..e8416d6012 100644 --- a/tools/llvm-mcmarkup/llvm-mcmarkup.cpp +++ b/tools/llvm-mcmarkup/llvm-mcmarkup.cpp @@ -21,6 +21,7 @@ #include "llvm/Support/raw_ostream.h" #include using namespace llvm; +using std::error_code; static cl::list InputFilenames(cl::Positional, cl::desc(""), diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp index ec7b29824b..6476a60c7e 100644 --- a/tools/llvm-nm/llvm-nm.cpp +++ b/tools/llvm-nm/llvm-nm.cpp @@ -45,6 +45,7 @@ #include using namespace llvm; using namespace object; +using std::error_code; namespace { enum OutputFormatTy { bsd, sysv, posix, darwin }; diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index 974a83721e..254c802aec 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -64,6 +64,7 @@ using namespace llvm; using namespace object; +using std::error_code; static cl::list InputFilenames(cl::Positional, cl::desc(""),cl::ZeroOrMore); diff --git a/tools/llvm-objdump/llvm-objdump.h b/tools/llvm-objdump/llvm-objdump.h index 30f2eea81f..32a375b8ac 100644 --- a/tools/llvm-objdump/llvm-objdump.h +++ b/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/tools/llvm-profdata/llvm-profdata.cpp b/tools/llvm-profdata/llvm-profdata.cpp index fdde32ac6b..9bf0897949 100644 --- a/tools/llvm-profdata/llvm-profdata.cpp +++ b/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/tools/llvm-readobj/ARMEHABIPrinter.h b/tools/llvm-readobj/ARMEHABIPrinter.h index 7608cfbbd8..716c9a1a48 100644 --- a/tools/llvm-readobj/ARMEHABIPrinter.h +++ b/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/tools/llvm-readobj/ARMWinEHPrinter.h b/tools/llvm-readobj/ARMWinEHPrinter.h index eddcaf4d96..e758bbf124 100644 --- a/tools/llvm-readobj/ARMWinEHPrinter.h +++ b/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/tools/llvm-readobj/Win64EHDumper.cpp b/tools/llvm-readobj/Win64EHDumper.cpp index c64d362469..f3749fc36c 100644 --- a/tools/llvm-readobj/Win64EHDumper.cpp +++ b/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 UnwindFlags[] = { { "ExceptionHandler", UNW_ExceptionHandler }, diff --git a/tools/llvm-readobj/Win64EHDumper.h b/tools/llvm-readobj/Win64EHDumper.h index 2eac81048b..98055994ae 100644 --- a/tools/llvm-readobj/Win64EHDumper.h +++ b/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/tools/llvm-readobj/llvm-readobj.h b/tools/llvm-readobj/llvm-readobj.h index 61ee0d4ed4..920e74ccc9 100644 --- a/tools/llvm-readobj/llvm-readobj.h +++ b/tools/llvm-readobj/llvm-readobj.h @@ -14,6 +14,7 @@ #include namespace llvm { +using std::error_code; namespace object { class RelocationRef; } diff --git a/tools/llvm-rtdyld/llvm-rtdyld.cpp b/tools/llvm-rtdyld/llvm-rtdyld.cpp index df6d535c43..e86d93bd49 100644 --- a/tools/llvm-rtdyld/llvm-rtdyld.cpp +++ b/tools/llvm-rtdyld/llvm-rtdyld.cpp @@ -28,6 +28,7 @@ #include using namespace llvm; using namespace llvm::object; +using std::error_code; static cl::list InputFileList(cl::Positional, cl::ZeroOrMore, diff --git a/tools/llvm-size/llvm-size.cpp b/tools/llvm-size/llvm-size.cpp index ff3b88e316..f0ec7fa6af 100644 --- a/tools/llvm-size/llvm-size.cpp +++ b/tools/llvm-size/llvm-size.cpp @@ -30,6 +30,7 @@ #include using namespace llvm; using namespace object; +using std::error_code; enum OutputFormatTy {berkeley, sysv}; static cl::opt diff --git a/tools/llvm-symbolizer/LLVMSymbolize.cpp b/tools/llvm-symbolizer/LLVMSymbolize.cpp index 125e63f225..61c4e8ad20 100644 --- a/tools/llvm-symbolizer/LLVMSymbolize.cpp +++ b/tools/llvm-symbolizer/LLVMSymbolize.cpp @@ -26,6 +26,7 @@ #include namespace llvm { +using std::error_code; namespace symbolize { static bool error(error_code ec) { diff --git a/tools/llvm-symbolizer/llvm-symbolizer.cpp b/tools/llvm-symbolizer/llvm-symbolizer.cpp index 29db172531..2ee30e816e 100644 --- a/tools/llvm-symbolizer/llvm-symbolizer.cpp +++ b/tools/llvm-symbolizer/llvm-symbolizer.cpp @@ -29,6 +29,7 @@ using namespace llvm; using namespace symbolize; +using std::error_code; static cl::opt ClUseSymbolTable("use-symbol-table", cl::init(true), diff --git a/tools/macho-dump/macho-dump.cpp b/tools/macho-dump/macho-dump.cpp index e7575f0056..13e8a4b80c 100644 --- a/tools/macho-dump/macho-dump.cpp +++ b/tools/macho-dump/macho-dump.cpp @@ -23,6 +23,7 @@ #include using namespace llvm; using namespace llvm::object; +using std::error_code; static cl::opt InputFile(cl::Positional, cl::desc(""), cl::init("-")); diff --git a/tools/obj2yaml/coff2yaml.cpp b/tools/obj2yaml/coff2yaml.cpp index 42b09d312c..816f9e65cd 100644 --- a/tools/obj2yaml/coff2yaml.cpp +++ b/tools/obj2yaml/coff2yaml.cpp @@ -14,6 +14,7 @@ #include "llvm/Support/YAMLTraits.h" using namespace llvm; +using std::error_code; namespace { -- cgit v1.2.3