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/lib/Object | |
| 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/lib/Object')
| -rw-r--r-- | llvm/lib/Object/Error.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Object/Error.cpp b/llvm/lib/Object/Error.cpp index 39d765f884e..0a29cac6c4e 100644 --- a/llvm/lib/Object/Error.cpp +++ b/llvm/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; } |
