[llvm] r210731 - Don't import error_condition into the llvm namespace.

[Rafael Espindola]

Author: rafael
Date: Wed Jun 11 20:29:42 2014
New Revision: 210731

URL: http://llvm.org/viewvc/llvm-project?rev=210731&view=rev
Log:
Don't import error_condition into the llvm namespace.

Modified:
    llvm/trunk/include/llvm/Support/system_error.h
    llvm/trunk/lib/Object/Error.cpp
    llvm/trunk/lib/ProfileData/InstrProf.cpp
    llvm/trunk/tools/llvm-readobj/Error.cpp
    llvm/trunk/tools/obj2yaml/Error.cpp

Modified: llvm/trunk/include/llvm/Support/system_error.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/system_error.h?rev=210731&r1=210730&r2=210731&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/system_error.h (original)
+++ llvm/trunk/include/llvm/Support/system_error.h Wed Jun 11 20:29:42 2014
@@ -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

Modified: llvm/trunk/lib/Object/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Error.cpp?rev=210731&r1=210730&r2=210731&view=diff
==============================================================================
--- llvm/trunk/lib/Object/Error.cpp (original)
+++ llvm/trunk/lib/Object/Error.cpp Wed Jun 11 20:29:42 2014
@@ -22,7 +22,8 @@ class _object_error_category : public er
 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::mess
                    "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;
 }
 

Modified: llvm/trunk/lib/ProfileData/InstrProf.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/InstrProf.cpp?rev=210731&r1=210730&r2=210731&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/InstrProf.cpp (original)
+++ llvm/trunk/lib/ProfileData/InstrProf.cpp Wed Jun 11 20:29:42 2014
@@ -52,9 +52,10 @@ class InstrProfErrorCategoryType : publi
     }
     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;
   }
 };

Modified: llvm/trunk/tools/llvm-readobj/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/Error.cpp?rev=210731&r1=210730&r2=210731&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/Error.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/Error.cpp Wed Jun 11 20:29:42 2014
@@ -21,7 +21,8 @@ class _readobj_error_category : public e
 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::mes
                    "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;
 }
 

Modified: llvm/trunk/tools/obj2yaml/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/Error.cpp?rev=210731&r1=210730&r2=210731&view=diff
==============================================================================
--- llvm/trunk/tools/obj2yaml/Error.cpp (original)
+++ llvm/trunk/tools/obj2yaml/Error.cpp Wed Jun 11 20:29:42 2014
@@ -17,7 +17,8 @@ class _obj2yaml_error_category : public
 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::me
                    "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;
 }