maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Don't import error_condition into the llvm namespace. 

llvm-svn: 210731
This commit is contained in:
Rafael Espindola 2014-06-12 01:29:42 +00:00
parent 7cc0d413b5
commit acc5d7c911
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/include/llvm/Support/system_error.h
View File

@ -21,7 +21,6 @@ using std::error_code;
using std::generic_category; using std::generic_category;
using std::error_category; using std::error_category;
using std::make_error_code; using std::make_error_code;
using std::error_condition;
} }
#endif #endif

8
llvm/lib/Object/Error.cpp
View File

@ -22,7 +22,8 @@ class _object_error_category : public error_category {
public: public:
const char* name() const LLVM_NOEXCEPT override; const char* name() const LLVM_NOEXCEPT override;
std::string message(int ev) const 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."); "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) if (static_cast<object_error>(EV) == object_error::success)
return error_condition(); return std::error_condition();
return std::errc::invalid_argument; return std::errc::invalid_argument;
} }

5
llvm/lib/ProfileData/InstrProf.cpp
View File

@ -52,9 +52,10 @@ class InstrProfErrorCategoryType : public error_category {
} }
llvm_unreachable("A value of instrprof_error has no message."); llvm_unreachable("A value of instrprof_error has no message.");
} }
error_condition default_error_condition(int EV) const LLVM_NOEXCEPT override { std::error_condition
default_error_condition(int EV) const LLVM_NOEXCEPT override {
if (static_cast<instrprof_error>(EV) == instrprof_error::success) if (static_cast<instrprof_error>(EV) == instrprof_error::success)
return error_condition(); return std::error_condition();
return std::errc::invalid_argument; return std::errc::invalid_argument;
} }
}; };

8
llvm/tools/llvm-readobj/Error.cpp
View File

@ -21,7 +21,8 @@ class _readobj_error_category : public error_category {
public: public:
const char* name() const LLVM_NOEXCEPT override; const char* name() const LLVM_NOEXCEPT override;
std::string message(int ev) const 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 } // namespace
@ -47,9 +48,10 @@ std::string _readobj_error_category::message(int EV) const {
"defined."); "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) if (static_cast<readobj_error>(EV) == readobj_error::success)
return error_condition(); return std::error_condition();
return std::errc::invalid_argument; return std::errc::invalid_argument;
} }

7
llvm/tools/obj2yaml/Error.cpp
View File

@ -17,7 +17,8 @@ class _obj2yaml_error_category : public error_category {
public: public:
const char *name() const LLVM_NOEXCEPT override; const char *name() const LLVM_NOEXCEPT override;
std::string message(int ev) const 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 } // namespace
@ -38,10 +39,10 @@ std::string _obj2yaml_error_category::message(int ev) const {
"defined."); "defined.");
} }
error_condition std::error_condition
_obj2yaml_error_category::default_error_condition(int ev) const { _obj2yaml_error_category::default_error_condition(int ev) const {
if (static_cast<obj2yaml_error>(ev) == obj2yaml_error::success) if (static_cast<obj2yaml_error>(ev) == obj2yaml_error::success)
return error_condition(); return std::error_condition();
return std::errc::invalid_argument; return std::errc::invalid_argument;
} }