4 files changed, 7 insertions, 7 deletions
diff --git a/llvm/include/llvm/Support/system_error.h b/llvm/include/llvm/Support/system_error.h
index 046132f8598..4ca4b069748 100644
--- a/llvm/include/llvm/Support/system_error.h
+++ b/llvm/include/llvm/Support/system_error.h
@@ -628,8 +628,8 @@ class error_category
 public:
   virtual ~error_category();
 
-private:
   error_category();
+private:
   error_category(const error_category&) LLVM_DELETED_FUNCTION;
   error_category& operator=(const error_category&) LLVM_DELETED_FUNCTION;
 
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 19528c8e67b..ab0a1249f2d 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -3257,7 +3257,7 @@ error_code BitcodeReader::InitLazyStream() {
 }
 
 namespace {
-class BitcodeErrorCategoryType : public _do_message {
+class BitcodeErrorCategoryType : public error_category {
   const char *name() const override {
     return "llvm.bitcode";
   }
diff --git a/llvm/lib/Object/Error.cpp b/llvm/lib/Object/Error.cpp
index 47ce38c8883..8e508696cfb 100644
--- a/llvm/lib/Object/Error.cpp
+++ b/llvm/lib/Object/Error.cpp
@@ -18,11 +18,11 @@ using namespace llvm;
 using namespace object;
 
 namespace {
-class _object_error_category : public _do_message {
+class _object_error_category : public error_category {
 public:
-  virtual const char* name() const;
-  virtual std::string message(int ev) const;
-  virtual error_condition default_error_condition(int ev) const;
+  const char* name() const override;
+  std::string message(int ev) const override;
+  error_condition default_error_condition(int ev) const override;
 };
 }
 
diff --git a/llvm/tools/llvm-readobj/Error.cpp b/llvm/tools/llvm-readobj/Error.cpp
index 1aed92bc8dd..83ed6a7dfc0 100644
--- a/llvm/tools/llvm-readobj/Error.cpp
+++ b/llvm/tools/llvm-readobj/Error.cpp
@@ -17,7 +17,7 @@
 using namespace llvm;
 
 namespace {
-class _readobj_error_category : public _do_message {
+class _readobj_error_category : public error_category {
 public:
   const char* name() const override;
   std::string message(int ev) const override;