Don't import error_condition into the llvm namespace.

[oota-llvm.git] / tools / obj2yaml / Error.cpp

diff --git a/tools/obj2yaml/Error.cpp b/tools/obj2yaml/Error.cpp
index ab615ee1937ee117810ab1337a804b35274556d0..3034e08951446b063876068b203819cd0ef5824a 100644 (file)
--- 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;
 }