diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 01:45:43 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 01:45:43 +0000 |
| commit | 25188c95de6bd74e15dad873ff5fc7e7c1330191 (patch) | |
| tree | 325de84cba8ce381a3be7853e913180b056800fd /llvm/tools/llvm-readobj | |
| parent | 92d8b456d92927b1a86110dce0a3567062eab801 (diff) | |
| download | bcm5719-llvm-25188c95de6bd74e15dad873ff5fc7e7c1330191.tar.gz bcm5719-llvm-25188c95de6bd74e15dad873ff5fc7e7c1330191.zip | |
Don't import error_category into the llvm namespace.
llvm-svn: 210733
Diffstat (limited to 'llvm/tools/llvm-readobj')
| -rw-r--r-- | llvm/tools/llvm-readobj/Error.cpp | 4 | ||||
| -rw-r--r-- | llvm/tools/llvm-readobj/Error.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/tools/llvm-readobj/Error.cpp b/llvm/tools/llvm-readobj/Error.cpp index 35e0a48fda0..4245e8d561a 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 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/llvm/tools/llvm-readobj/Error.h b/llvm/tools/llvm-readobj/Error.h index b3aab327cbe..b4ffb82efcd 100644 --- a/llvm/tools/llvm-readobj/Error.h +++ b/llvm/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, |
