summaryrefslogtreecommitdiff
path: root/tools/llvm-readobj
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-06-12 01:45:43 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-06-12 01:45:43 +0000
commit9ee34311f3a9f6d49023bc74f6028133f90e1d4f (patch)
tree6b3d06f5e87630dedb0061106b53f58c8b2b5c12 /tools/llvm-readobj
parent173d7ff83300ece5cc18049cf5c909c1e8d179d9 (diff)
downloadllvm-9ee34311f3a9f6d49023bc74f6028133f90e1d4f.tar.gz
llvm-9ee34311f3a9f6d49023bc74f6028133f90e1d4f.tar.bz2
llvm-9ee34311f3a9f6d49023bc74f6028133f90e1d4f.tar.xz
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
Diffstat (limited to 'tools/llvm-readobj')
-rw-r--r--tools/llvm-readobj/Error.cpp4
-rw-r--r--tools/llvm-readobj/Error.h2
2 files changed, 3 insertions, 3 deletions
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,