Object, COFF: Tighten the object file parser

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

diff --git a/tools/llvm-readobj/Error.cpp b/tools/llvm-readobj/Error.cpp
index a68ebeb58e74af2d8ecab3f698d2d586ee9e6ce4..7e6f780c5d1a29ef245fdd60903b369d8df3708b 100644 (file)
--- a/tools/llvm-readobj/Error.cpp
+++ b/tools/llvm-readobj/Error.cpp
@@ -17,15 +17,14 @@
 using namespace llvm;
 
 namespace {
-class _readobj_error_category : public error_category {
+class _readobj_error_category : public std::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;
 };
 } // namespace
 
-const char *_readobj_error_category::name() const {
+const char *_readobj_error_category::name() const LLVM_NOEXCEPT {
   return "llvm.readobj";
 }
 
@@ -47,14 +46,8 @@ std::string _readobj_error_category::message(int EV) const {
                    "defined.");
 }
 
-error_condition _readobj_error_category::default_error_condition(int EV) const {
-  if (static_cast<readobj_error>(EV) == readobj_error::success)
-    return error_condition();
-  return errc::invalid_argument;
-}
-
 namespace llvm {
-const error_category &readobj_category() {
+const std::error_category &readobj_category() {
   static _readobj_error_category o;
   return o;
 }