Merge alignment of common GlobalValue.

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

diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp
index f1d0f0184d242c2f786b4c910899627954ddb174..e7431d780740fd53a1a2fe11265a842f4f234b6c 100644 (file)
--- a/lib/Object/Error.cpp
+++ b/lib/Object/Error.cpp
@@ -18,15 +18,14 @@ using namespace llvm;
 using namespace object;
 
 namespace {
-class _object_error_category : public error_category {
+class _object_error_category : public std::error_category {
 public:
-  const char* name() const override;
+  const char* name() const LLVM_NOEXCEPT override;
   std::string message(int ev) const override;
-  error_condition default_error_condition(int ev) const override;
 };
 }
 
-const char *_object_error_category::name() const {
+const char *_object_error_category::name() const LLVM_NOEXCEPT {
   return "llvm.object";
 }
 
@@ -47,13 +46,7 @@ std::string _object_error_category::message(int EV) const {
                    "defined.");
 }
 
-error_condition _object_error_category::default_error_condition(int EV) const {
-  if (static_cast<object_error>(EV) == object_error::success)
-    return error_condition();
-  return errc::invalid_argument;
-}
-
-const error_category &object::object_category() {
+const std::error_category &object::object_category() {
   static _object_error_category o;
   return o;
 }