[lld] r210730 - Use error_condition from the std namespace.

Rafael Espindola rafael.espindola at gmail.com
Wed Jun 11 18:28:12 PDT 2014


Author: rafael
Date: Wed Jun 11 20:28:12 2014
New Revision: 210730

URL: http://llvm.org/viewvc/llvm-project?rev=210730&view=rev
Log:
Use error_condition from the std namespace.

Modified:
    lld/trunk/lib/Core/Error.cpp

Modified: lld/trunk/lib/Core/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/Error.cpp?rev=210730&r1=210729&r2=210730&view=diff
==============================================================================
--- lld/trunk/lib/Core/Error.cpp (original)
+++ lld/trunk/lib/Core/Error.cpp Wed Jun 11 20:28:12 2014
@@ -41,10 +41,10 @@ public:
                      "message defined.");
   }
 
-  llvm::error_condition
+  std::error_condition
   default_error_condition(int ev) const LLVM_NOEXCEPT override {
     if (NativeReaderError(ev) == NativeReaderError::success)
-      return llvm::error_condition();
+      return std::error_condition();
     return std::errc::invalid_argument;
   }
 };
@@ -71,10 +71,10 @@ public:
                      "message defined.");
   }
 
-  llvm::error_condition
+  std::error_condition
   default_error_condition(int ev) const LLVM_NOEXCEPT override {
     if (YamlReaderError(ev) == YamlReaderError::success)
-      return llvm::error_condition();
+      return std::error_condition();
     return std::errc::invalid_argument;
   }
 };
@@ -101,11 +101,11 @@ public:
         "message defined.");
   }
 
-  llvm::error_condition
+  std::error_condition
   default_error_condition(int ev) const LLVM_NOEXCEPT override {
     LinkerScriptReaderError e = LinkerScriptReaderError(ev);
     if (e == LinkerScriptReaderError::success)
-      return llvm::error_condition();
+      return std::error_condition();
     return std::errc::invalid_argument;
   }
 };
@@ -128,10 +128,10 @@ public:
                      "message defined.");
   }
 
-  llvm::error_condition
+  std::error_condition
   default_error_condition(int ev) const LLVM_NOEXCEPT override {
     if (InputGraphError(ev) == InputGraphError::success)
-      return llvm::error_condition();
+      return std::error_condition();
     return std::errc::invalid_argument;
   }
 };
@@ -157,10 +157,10 @@ public:
                      "message defined.");
   }
 
-  llvm::error_condition
+  std::error_condition
   default_error_condition(int ev) const LLVM_NOEXCEPT override {
     if (ReaderError(ev) == ReaderError::success)
-      return llvm::error_condition();
+      return std::error_condition();
     return std::errc::invalid_argument;
   }
 };





More information about the llvm-commits mailing list