From 173d7ff83300ece5cc18049cf5c909c1e8d179d9 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 12 Jun 2014 01:29:42 +0000
Subject: [PATCH] Don't import error_condition into the llvm namespace.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210731 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/Support/system_error.h | 1 -
 lib/Object/Error.cpp                | 8 +++++---
 lib/ProfileData/InstrProf.cpp       | 5 +++--
 tools/llvm-readobj/Error.cpp        | 8 +++++---
 tools/obj2yaml/Error.cpp            | 7 ++++---
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/include/llvm/Support/system_error.h b/include/llvm/Support/system_error.h
index ad2c99c25c1..83645173b9c 100644
--- a/include/llvm/Support/system_error.h
+++ b/include/llvm/Support/system_error.h
@@ -21,7 +21,6 @@ using std::error_code;
 using std::generic_category;
 using std::error_category;
 using std::make_error_code;
-using std::error_condition;
 }
 
 #endif
diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp
index a373cff1956..39d765f884e 100644
--- a/lib/Object/Error.cpp
+++ b/lib/Object/Error.cpp
@@ -22,7 +22,8 @@ class _object_error_category : public error_category {
 public:
   const char* name() const LLVM_NOEXCEPT override;
   std::string message(int ev) const override;
-  error_condition default_error_condition(int ev) const LLVM_NOEXCEPT override;
+  std::error_condition
+  default_error_condition(int ev) const LLVM_NOEXCEPT override;
 };
 }
 
@@ -47,9 +48,10 @@ std::string _object_error_category::message(int EV) const {
                    "defined.");
 }
 
-error_condition _object_error_category::default_error_condition(int EV) const {
+std::error_condition
+_object_error_category::default_error_condition(int EV) const {
   if (static_cast<object_error>(EV) == object_error::success)
-    return error_condition();
+    return std::error_condition();
   return std::errc::invalid_argument;
 }
 
diff --git a/lib/ProfileData/InstrProf.cpp b/lib/ProfileData/InstrProf.cpp
index eed517df052..88ae7582ccb 100644
--- a/lib/ProfileData/InstrProf.cpp
+++ b/lib/ProfileData/InstrProf.cpp
@@ -52,9 +52,10 @@ class InstrProfErrorCategoryType : public error_category {
     }
     llvm_unreachable("A value of instrprof_error has no message.");
   }
-  error_condition default_error_condition(int EV) const LLVM_NOEXCEPT override {
+  std::error_condition
+  default_error_condition(int EV) const LLVM_NOEXCEPT override {
     if (static_cast<instrprof_error>(EV) == instrprof_error::success)
-      return error_condition();
+      return std::error_condition();
     return std::errc::invalid_argument;
   }
 };
diff --git a/tools/llvm-readobj/Error.cpp b/tools/llvm-readobj/Error.cpp
index a276fcedb8c..35e0a48fda0 100644
--- a/tools/llvm-readobj/Error.cpp
+++ b/tools/llvm-readobj/Error.cpp
@@ -21,7 +21,8 @@ class _readobj_error_category : public error_category {
 public:
   const char* name() const LLVM_NOEXCEPT override;
   std::string message(int ev) const override;
-  error_condition default_error_condition(int ev) const LLVM_NOEXCEPT override;
+  std::error_condition
+  default_error_condition(int ev) const LLVM_NOEXCEPT override;
 };
 } // namespace
 
@@ -47,9 +48,10 @@ std::string _readobj_error_category::message(int EV) const {
                    "defined.");
 }
 
-error_condition _readobj_error_category::default_error_condition(int EV) const {
+std::error_condition
+_readobj_error_category::default_error_condition(int EV) const {
   if (static_cast<readobj_error>(EV) == readobj_error::success)
-    return error_condition();
+    return std::error_condition();
   return std::errc::invalid_argument;
 }
 
diff --git a/tools/obj2yaml/Error.cpp b/tools/obj2yaml/Error.cpp
index ab615ee1937..3034e089514 100644
--- a/tools/obj2yaml/Error.cpp
+++ b/tools/obj2yaml/Error.cpp
@@ -17,7 +17,8 @@ class _obj2yaml_error_category : public error_category {
 public:
   const char *name() const LLVM_NOEXCEPT override;
   std::string message(int ev) const override;
-  error_condition default_error_condition(int ev) const LLVM_NOEXCEPT override;
+  std::error_condition
+  default_error_condition(int ev) const LLVM_NOEXCEPT override;
 };
 } // namespace
 
@@ -38,10 +39,10 @@ std::string _obj2yaml_error_category::message(int ev) const {
                    "defined.");
 }
 
-error_condition
+std::error_condition
 _obj2yaml_error_category::default_error_condition(int ev) const {
   if (static_cast<obj2yaml_error>(ev) == obj2yaml_error::success)
-    return error_condition();
+    return std::error_condition();
   return std::errc::invalid_argument;
 }
 
-- 
2.34.1