diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 01:29:42 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 01:29:42 +0000 |
commit | 173d7ff83300ece5cc18049cf5c909c1e8d179d9 (patch) | |
tree | fb50c261a9b8c1ee2f480fe5acf4b68e10f817fc /tools/obj2yaml | |
parent | 5ac7ab395a4a2954d2c5aefa75f2affc859641cc (diff) |
Don't import error_condition into the llvm namespace.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210731 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/obj2yaml')
-rw-r--r-- | tools/obj2yaml/Error.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/obj2yaml/Error.cpp b/tools/obj2yaml/Error.cpp index ab615ee1937..3034e089514 100644 --- a/tools/obj2yaml/Error.cpp +++ b/tools/obj2yaml/Error.cpp @@ -17,7 +17,8 @@ class _obj2yaml_error_category : public error_category { public: const char *name() const LLVM_NOEXCEPT override; std::string message(int ev) const override; - error_condition default_error_condition(int ev) const LLVM_NOEXCEPT override; + std::error_condition + default_error_condition(int ev) const LLVM_NOEXCEPT override; }; } // namespace @@ -38,10 +39,10 @@ std::string _obj2yaml_error_category::message(int ev) const { "defined."); } -error_condition +std::error_condition _obj2yaml_error_category::default_error_condition(int ev) const { if (static_cast<obj2yaml_error>(ev) == obj2yaml_error::success) - return error_condition(); + return std::error_condition(); return std::errc::invalid_argument; } |