commit acc5d7c9119db84f8a764f0536585e434acd83b8
author Rafael Espindola <rafael.espindola@gmail.com> Thu Jun 12 01:29:42 2014 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Thu Jun 12 01:29:42 2014 +0000
tree 33f4716978e50fbfc077cd3a83ecc2e7762f0a9f
parent 7cc0d413b54949fe9f05cbcea11cd20c9ea44994

Don't import error_condition into the llvm namespace.

llvm-svn: 210731

llvm/lib/Object/Error.cpp

diff --git a/llvm/lib/Object/Error.cpp b/llvm/lib/Object/Error.cpp
index a373cff..39d765f 100644
--- a/llvm/lib/Object/Error.cpp
+++ b/llvm/lib/Object/Error.cpp
@@ -22,7 +22,8 @@
 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 @@
                    "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;
 }