Don't import error_category into the llvm namespace.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210733 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Object/Error.h b/include/llvm/Object/Error.h
index 15824f8e11649a935a175552e10fd1d0dc0ceb3f..3db9fa45e38b7a34c81d6325602b99e8bba04f09 100644 (file)
--- a/include/llvm/Object/Error.h
+++ b/include/llvm/Object/Error.h
@@ -19,7 +19,7 @@
 namespace llvm {
 namespace object {
 
-const error_category &object_category();
+const std::error_category &object_category();
 
 enum class object_error {
   success = 0,

diff --git a/include/llvm/ProfileData/InstrProf.h b/include/llvm/ProfileData/InstrProf.h
index 755ba36bcab9f848f9aefcc67a21fd911a15d337..b44b92ef62676fbd6869defdfdaa20124d7c6265 100644 (file)
--- a/include/llvm/ProfileData/InstrProf.h
+++ b/include/llvm/ProfileData/InstrProf.h
@@ -20,7 +20,7 @@
 
 namespace llvm {
 
-const error_category &instrprof_category();
+const std::error_category &instrprof_category();
 
 enum class instrprof_error {
     success = 0,

diff --git a/include/llvm/Support/system_error.h b/include/llvm/Support/system_error.h
index 83645173b9cc2f4e5d45a2e0dd7dacabb7ef4d0e..932fc1e1ad03749b502db60d4e22f2f0639eadf0 100644 (file)
--- a/include/llvm/Support/system_error.h
+++ b/include/llvm/Support/system_error.h
@@ -19,7 +19,6 @@
 namespace llvm {
 using std::error_code;
 using std::generic_category;
-using std::error_category;
 using std::make_error_code;
 }
 

diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 849c548e0bc448c5c4d05a7125055a8215d1f32b..a5eec0f70d40370cb7fe192b686b3dba5a1d1dd1 100644 (file)
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -3300,7 +3300,7 @@ error_code BitcodeReader::InitLazyStream() {
 }
 
 namespace {
-class BitcodeErrorCategoryType : public error_category {
+class BitcodeErrorCategoryType : public std::error_category {
   const char *name() const LLVM_NOEXCEPT override {
     return "llvm.bitcode";
   }
@@ -3351,7 +3351,7 @@ class BitcodeErrorCategoryType : public error_category {
 };
 }
 
-const error_category &BitcodeReader::BitcodeErrorCategory() {
+const std::error_category &BitcodeReader::BitcodeErrorCategory() {
   static BitcodeErrorCategoryType O;
   return O;
 }

diff --git a/lib/Bitcode/Reader/BitcodeReader.h b/lib/Bitcode/Reader/BitcodeReader.h
index 593d8f93ccf3fb1ca60a8cec1cc6b1ea99a51a0c..65821caf85794c876f6ec817fd90fdf5069d46dd 100644 (file)
--- a/lib/Bitcode/Reader/BitcodeReader.h
+++ b/lib/Bitcode/Reader/BitcodeReader.h
@@ -193,7 +193,7 @@ class BitcodeReader : public GVMaterializer {
   /// not need this flag.
   bool UseRelativeIDs;
 
-  static const error_category &BitcodeErrorCategory();
+  static const std::error_category &BitcodeErrorCategory();
 
 public:
   enum ErrorType {

diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp
index 39d765f884e27f9628c7b8ca970fbd165b98a54a..0a29cac6c4e57653a4e0fb7f57296d2bf596b13a 100644 (file)
--- a/lib/Object/Error.cpp
+++ b/lib/Object/Error.cpp
@@ -18,7 +18,7 @@ using namespace llvm;
 using namespace object;
 
 namespace {
-class _object_error_category : public error_category {
+class _object_error_category : public std::error_category {
 public:
   const char* name() const LLVM_NOEXCEPT override;
   std::string message(int ev) const override;
@@ -55,7 +55,7 @@ _object_error_category::default_error_condition(int EV) const {
   return std::errc::invalid_argument;
 }
 
-const error_category &object::object_category() {
+const std::error_category &object::object_category() {
   static _object_error_category o;
   return o;
 }

diff --git a/lib/ProfileData/InstrProf.cpp b/lib/ProfileData/InstrProf.cpp
index 88ae7582ccbdaf986e61bf28632ee7c18ae1eff3..628edfb86cd989d06aea48086da761399151b921 100644 (file)
--- a/lib/ProfileData/InstrProf.cpp
+++ b/lib/ProfileData/InstrProf.cpp
@@ -18,7 +18,7 @@
 using namespace llvm;
 
 namespace {
-class InstrProfErrorCategoryType : public error_category {
+class InstrProfErrorCategoryType : public std::error_category {
   const char *name() const LLVM_NOEXCEPT override { return "llvm.instrprof"; }
   std::string message(int IE) const override {
     instrprof_error E = static_cast<instrprof_error>(IE);
@@ -61,7 +61,7 @@ class InstrProfErrorCategoryType : public error_category {
 };
 }
 
-const error_category &llvm::instrprof_category() {
+const std::error_category &llvm::instrprof_category() {
   static InstrProfErrorCategoryType C;
   return C;
 }

diff --git a/tools/llvm-readobj/Error.cpp b/tools/llvm-readobj/Error.cpp
index 35e0a48fda08beff3dd845228b6d4a466285c0b6..4245e8d561a34aa3114d4de76f63a850b19bf244 100644 (file)
--- a/tools/llvm-readobj/Error.cpp
+++ b/tools/llvm-readobj/Error.cpp
@@ -17,7 +17,7 @@
 using namespace llvm;
 
 namespace {
-class _readobj_error_category : public error_category {
+class _readobj_error_category : public std::error_category {
 public:
   const char* name() const LLVM_NOEXCEPT override;
   std::string message(int ev) const override;
@@ -56,7 +56,7 @@ _readobj_error_category::default_error_condition(int EV) const {
 }
 
 namespace llvm {
-const error_category &readobj_category() {
+const std::error_category &readobj_category() {
   static _readobj_error_category o;
   return o;
 }

diff --git a/tools/llvm-readobj/Error.h b/tools/llvm-readobj/Error.h
index b3aab327cbef8e0e60431f0adecd5e0c43fba0ee..b4ffb82efcd688433bf2f2717f392855936d8c41 100644 (file)
--- a/tools/llvm-readobj/Error.h
+++ b/tools/llvm-readobj/Error.h
@@ -18,7 +18,7 @@
 
 namespace llvm {
 
-const error_category &readobj_category();
+const std::error_category &readobj_category();
 
 enum class readobj_error {
   success = 0,

diff --git a/tools/obj2yaml/Error.cpp b/tools/obj2yaml/Error.cpp
index 3034e08951446b063876068b203819cd0ef5824a..5b07b9cda8d6eab3ffefe81a5df28b2ddc7ae145 100644 (file)
--- a/tools/obj2yaml/Error.cpp
+++ b/tools/obj2yaml/Error.cpp
@@ -13,7 +13,7 @@
 using namespace llvm;
 
 namespace {
-class _obj2yaml_error_category : public error_category {
+class _obj2yaml_error_category : public std::error_category {
 public:
   const char *name() const LLVM_NOEXCEPT override;
   std::string message(int ev) const override;
@@ -47,7 +47,7 @@ _obj2yaml_error_category::default_error_condition(int ev) const {
 }
 
 namespace llvm {
-const error_category &obj2yaml_category() {
+  const std::error_category &obj2yaml_category() {
   static _obj2yaml_error_category o;
   return o;
 }

diff --git a/tools/obj2yaml/Error.h b/tools/obj2yaml/Error.h
index 7180d543075e96fba8c5f966436322148e6d67ad..b4d13ba7d03a82317c89e1ef46d3ef328810f416 100644 (file)
--- a/tools/obj2yaml/Error.h
+++ b/tools/obj2yaml/Error.h
@@ -14,7 +14,7 @@
 
 namespace llvm {
 
-const error_category &obj2yaml_category();
+const std::error_category &obj2yaml_category();
 
 enum class obj2yaml_error {
   success = 0,