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
This commit is contained in:
Rafael Espindola
2014-06-12 01:29:42 +00:00
parent 5ac7ab395a
commit 173d7ff833
5 changed files with 17 additions and 12 deletions

View File

@ -22,7 +22,8 @@ class _object_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;
};
}
@ -47,9 +48,10 @@ std::string _object_error_category::message(int EV) const {
"defined.");
}
error_condition _object_error_category::default_error_condition(int EV) const {
std::error_condition
_object_error_category::default_error_condition(int EV) const {
if (static_cast<object_error>(EV) == object_error::success)
return error_condition();
return std::error_condition();
return std::errc::invalid_argument;
}