summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support/YAMLTraits.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-06-11 19:05:50 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-06-11 19:05:50 +0000
commit5c4f829424b0e9b3308b716f5874c9a3a978ac6a (patch)
tree4c364dafb939924b5f8eae362c44570e4bd42c01 /llvm/lib/Support/YAMLTraits.cpp
parentcd7c3a9de4397b3fe24384eb503ab9f1911009aa (diff)
downloadbcm5719-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/Support/YAMLTraits.cpp')
-rw-r--r--llvm/lib/Support/YAMLTraits.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Support/YAMLTraits.cpp b/llvm/lib/Support/YAMLTraits.cpp
index 20f8b245c94..ed80eac76a9 100644
--- a/llvm/lib/Support/YAMLTraits.cpp
+++ b/llvm/lib/Support/YAMLTraits.cpp
@@ -74,7 +74,7 @@ bool Input::setCurrentDocument() {
Node *N = DocIterator->getRoot();
if (!N) {
assert(Strm->failed() && "Root is NULL iff parsing failed");
- EC = make_error_code(errc::invalid_argument);
+ EC = make_error_code(std::errc::invalid_argument);
return false;
}
@@ -124,7 +124,7 @@ bool Input::preflightKey(const char *Key, bool Required, bool, bool &UseDefault,
// nodes are present.
if (!CurrentNode) {
if (Required)
- EC = make_error_code(errc::invalid_argument);
+ EC = make_error_code(std::errc::invalid_argument);
return false;
}
@@ -300,7 +300,7 @@ void Input::setError(HNode *hnode, const Twine &message) {
void Input::setError(Node *node, const Twine &message) {
Strm->printError(node, message);
- EC = make_error_code(errc::invalid_argument);
+ EC = make_error_code(std::errc::invalid_argument);
}
Input::HNode *Input::createHNodes(Node *N) {
OpenPOWER on IntegriCloud