Don't import error_condition into the llvm namespace.

llvm-svn: 210731

1 files changed, 5 insertions, 3 deletions

diff --git a/llvm/tools/llvm-readobj/Error.cpp b/llvm/tools/llvm-readobj/Error.cpp
index a276fcedb8c..35e0a48fda0 100644
--- a/llvm/tools/llvm-readobj/Error.cpp
+++ b/llvm/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;
 }