summaryrefslogtreecommitdiff
path: root/tools/llvm-readobj
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-06-12 01:29:42 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-06-12 01:29:42 +0000
commit173d7ff83300ece5cc18049cf5c909c1e8d179d9 (patch)
treefb50c261a9b8c1ee2f480fe5acf4b68e10f817fc /tools/llvm-readobj
parent5ac7ab395a4a2954d2c5aefa75f2affc859641cc (diff)
downloadllvm-173d7ff83300ece5cc18049cf5c909c1e8d179d9.tar.gz
llvm-173d7ff83300ece5cc18049cf5c909c1e8d179d9.tar.bz2
llvm-173d7ff83300ece5cc18049cf5c909c1e8d179d9.tar.xz
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/llvm-readobj')
-rw-r--r--tools/llvm-readobj/Error.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/llvm-readobj/Error.cpp b/tools/llvm-readobj/Error.cpp
index a276fcedb8..35e0a48fda 100644
--- a/tools/llvm-readobj/Error.cpp
+++ b/tools/llvm-readobj/Error.cpp
@@ -21,7 +21,8 @@ class _readobj_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
@@ -47,9 +48,10 @@ std::string _readobj_error_category::message(int EV) const {
"defined.");
}
-error_condition _readobj_error_category::default_error_condition(int EV) const {
+std::error_condition
+_readobj_error_category::default_error_condition(int EV) const {
if (static_cast<readobj_error>(EV) == readobj_error::success)
- return error_condition();
+ return std::error_condition();
return std::errc::invalid_argument;
}