From 9ee34311f3a9f6d49023bc74f6028133f90e1d4f Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 12 Jun 2014 01:45:43 +0000
Subject: Don't import error_category into the llvm namespace.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210733 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/llvm-readobj/Error.cpp | 4 ++--
 tools/llvm-readobj/Error.h   | 2 +-
 tools/obj2yaml/Error.cpp     | 4 ++--
 tools/obj2yaml/Error.h       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/llvm-readobj/Error.cpp b/tools/llvm-readobj/Error.cpp
index 35e0a48fda..4245e8d561 100644
--- a/tools/llvm-readobj/Error.cpp
+++ b/tools/llvm-readobj/Error.cpp
@@ -17,7 +17,7 @@
 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;
@@ -56,7 +56,7 @@ _readobj_error_category::default_error_condition(int EV) const {
 }
 
 namespace llvm {
-const error_category &readobj_category() {
+const std::error_category &readobj_category() {
   static _readobj_error_category o;
   return o;
 }
diff --git a/tools/llvm-readobj/Error.h b/tools/llvm-readobj/Error.h
index b3aab327cb..b4ffb82efc 100644
--- a/tools/llvm-readobj/Error.h
+++ b/tools/llvm-readobj/Error.h
@@ -18,7 +18,7 @@
 
 namespace llvm {
 
-const error_category &readobj_category();
+const std::error_category &readobj_category();
 
 enum class readobj_error {
   success = 0,
diff --git a/tools/obj2yaml/Error.cpp b/tools/obj2yaml/Error.cpp
index 3034e08951..5b07b9cda8 100644
--- a/tools/obj2yaml/Error.cpp
+++ b/tools/obj2yaml/Error.cpp
@@ -13,7 +13,7 @@
 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;
@@ -47,7 +47,7 @@ _obj2yaml_error_category::default_error_condition(int ev) const {
 }
 
 namespace llvm {
-const error_category &obj2yaml_category() {
+  const std::error_category &obj2yaml_category() {
   static _obj2yaml_error_category o;
   return o;
 }
diff --git a/tools/obj2yaml/Error.h b/tools/obj2yaml/Error.h
index 7180d54307..b4d13ba7d0 100644
--- a/tools/obj2yaml/Error.h
+++ b/tools/obj2yaml/Error.h
@@ -14,7 +14,7 @@
 
 namespace llvm {
 
-const error_category &obj2yaml_category();
+const std::error_category &obj2yaml_category();
 
 enum class obj2yaml_error {
   success = 0,
-- 
cgit v1.2.3