From 7acd886ecfa0adc8a14476eafe8cf1fa981cfe18 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 11 Jun 2014 19:05:50 +0000 Subject: 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++. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210687 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/Error.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Object') diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp index 6bcc6f9a78..a373cff195 100644 --- a/lib/Object/Error.cpp +++ b/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(EV) == object_error::success) return error_condition(); - return errc::invalid_argument; + return std::errc::invalid_argument; } const error_category &object::object_category() { -- cgit v1.2.3