Don't import error_condition into the llvm namespace.

[oota-llvm.git] / lib / Object / Error.cpp

diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp
index a373cff1956fb608f0e60a062f329d9fab179351..39d765f884e27f9628c7b8ca970fbd165b98a54a 100644 (file)
--- 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;
 }