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

3 files changed, 2 insertions, 3 deletions

diff --git a/include/llvm/Object/Error.h b/include/llvm/Object/Error.h
index 15824f8e11..3db9fa45e3 100644
--- a/include/llvm/Object/Error.h
+++ b/include/llvm/Object/Error.h
@@ -19,7 +19,7 @@
 namespace llvm {
 namespace object {
 
-const error_category &object_category();
+const std::error_category &object_category();
 
 enum class object_error {
   success = 0,
diff --git a/include/llvm/ProfileData/InstrProf.h b/include/llvm/ProfileData/InstrProf.h
index 755ba36bca..b44b92ef62 100644
--- a/include/llvm/ProfileData/InstrProf.h
+++ b/include/llvm/ProfileData/InstrProf.h
@@ -20,7 +20,7 @@
 
 namespace llvm {
 
-const error_category &instrprof_category();
+const std::error_category &instrprof_category();
 
 enum class instrprof_error {
     success = 0,
diff --git a/include/llvm/Support/system_error.h b/include/llvm/Support/system_error.h
index 83645173b9..932fc1e1ad 100644
--- a/include/llvm/Support/system_error.h
+++ b/include/llvm/Support/system_error.h
@@ -19,7 +19,6 @@
 namespace llvm {
 using std::error_code;
 using std::generic_category;
-using std::error_category;
 using std::make_error_code;
 }