Check that COFF .obj files have sections with zero virtual address spaces.

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

diff --git a/tools/obj2yaml/Error.cpp b/tools/obj2yaml/Error.cpp
index 3034e08951446b063876068b203819cd0ef5824a..abef8af58cbfecd4797ed0dd0b2c3840e9ee6ad3 100644 (file)
--- a/tools/obj2yaml/Error.cpp
+++ b/tools/obj2yaml/Error.cpp
@@ -13,16 +13,16 @@
 using namespace llvm;
 
 namespace {
-class _obj2yaml_error_category : public error_category {
+class _obj2yaml_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
 
-const char *_obj2yaml_error_category::name() const { return "obj2yaml"; }
+const char *_obj2yaml_error_category::name() const LLVM_NOEXCEPT {
+  return "obj2yaml";
+}
 
 std::string _obj2yaml_error_category::message(int ev) const {
   switch (static_cast<obj2yaml_error>(ev)) {
@@ -39,15 +39,8 @@ std::string _obj2yaml_error_category::message(int ev) const {
                    "defined.");
 }
 
-std::error_condition
-_obj2yaml_error_category::default_error_condition(int ev) const {
-  if (static_cast<obj2yaml_error>(ev) == obj2yaml_error::success)
-    return std::error_condition();
-  return std::errc::invalid_argument;
-}
-
 namespace llvm {
-const error_category &obj2yaml_category() {
+  const std::error_category &obj2yaml_category() {
   static _obj2yaml_error_category o;
   return o;
 }