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 | 9ee34311f3a9f6d49023bc74f6028133f90e1d4f (patch) | |
tree | 6b3d06f5e87630dedb0061106b53f58c8b2b5c12 /lib/Object | |
parent | 173d7ff83300ece5cc18049cf5c909c1e8d179d9 (diff) | |
download | llvm-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 'lib/Object')
-rw-r--r-- | lib/Object/Error.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp index 39d765f884..0a29cac6c4 100644 --- a/lib/Object/Error.cpp +++ b/lib/Object/Error.cpp @@ -18,7 +18,7 @@ using namespace llvm; using namespace object; namespace { -class _object_error_category : public error_category { +class _object_error_category : public std::error_category { public: const char* name() const LLVM_NOEXCEPT override; std::string message(int ev) const override; @@ -55,7 +55,7 @@ _object_error_category::default_error_condition(int EV) const { return std::errc::invalid_argument; } -const error_category &object::object_category() { +const std::error_category &object::object_category() { static _object_error_category o; return o; } |