diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-11 19:05:50 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-11 19:05:50 +0000 |
commit | 5c4f829424b0e9b3308b716f5874c9a3a978ac6a (patch) | |
tree | 4c364dafb939924b5f8eae362c44570e4bd42c01 /llvm/lib/Object/Error.cpp | |
parent | cd7c3a9de4397b3fe24384eb503ab9f1911009aa (diff) | |
download | bcm5719-llvm-5c4f829424b0e9b3308b716f5874c9a3a978ac6a.tar.gz bcm5719-llvm-5c4f829424b0e9b3308b716f5874c9a3a978ac6a.zip |
Use std::error_code instead of llvm::error_code.
The idea of this patch is to turn llvm/Support/system_error.h into a
transitional header that just brings in the erorr_code api to the llvm
namespace. I will remove it shortly afterwards.
The cases where the general idea needed some tweaking:
* std::errc is a namespace in msvc, so we cannot use "using std::errc". I could
add an #ifdef, but there were not that many uses, so I just added std:: to
them in this patch.
* Template specialization had to be moved to the std namespace in this
patch set already.
* The msvc implementation of default_error_condition doesn't seem to
provide the same transformations as we need. Not too surprising since
the standard doesn't actually say what "equivalent" means. I fixed the
problem by keeping our old mapping and using it at error_code
construction time.
Despite these shortcomings I think this is still a good thing. Some reasons:
* The different implementations of system_error might improve over time.
* It removes 925 lines of code from llvm already.
* It removes 6313 bytes from the text segment of the clang binary when
it is built with gcc and 2816 bytes when building with clang and
libstdc++.
llvm-svn: 210687
Diffstat (limited to 'llvm/lib/Object/Error.cpp')
-rw-r--r-- | llvm/lib/Object/Error.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Object/Error.cpp b/llvm/lib/Object/Error.cpp index 6bcc6f9a781..a373cff1956 100644 --- a/llvm/lib/Object/Error.cpp +++ b/llvm/lib/Object/Error.cpp @@ -50,7 +50,7 @@ std::string _object_error_category::message(int EV) const { error_condition _object_error_category::default_error_condition(int EV) const { if (static_cast<object_error>(EV) == object_error::success) return error_condition(); - return errc::invalid_argument; + return std::errc::invalid_argument; } const error_category &object::object_category() { |