X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvm-readobj%2FError.cpp;h=a078f5c095c725db378c391d7d52580817ae6035;hb=f02f03c21aa5932bdb1ab433c3b9c9db8c3fe93e;hp=35e0a48fda08beff3dd845228b6d4a466285c0b6;hpb=173d7ff83300ece5cc18049cf5c909c1e8d179d9;p=oota-llvm.git diff --git a/tools/llvm-readobj/Error.cpp b/tools/llvm-readobj/Error.cpp index 35e0a48fda0..a078f5c095c 100644 --- a/tools/llvm-readobj/Error.cpp +++ b/tools/llvm-readobj/Error.cpp @@ -17,12 +17,10 @@ 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; - std::error_condition - default_error_condition(int ev) const LLVM_NOEXCEPT override; }; } // namespace @@ -48,15 +46,8 @@ std::string _readobj_error_category::message(int EV) const { "defined."); } -std::error_condition -_readobj_error_category::default_error_condition(int EV) const { - if (static_cast(EV) == readobj_error::success) - return std::error_condition(); - return std::errc::invalid_argument; -} - namespace llvm { -const error_category &readobj_category() { +const std::error_category &readobj_category() { static _readobj_error_category o; return o; }