diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 14:02:15 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 14:02:15 +0000 |
commit | c080917ec2d1b6cb94186875632fec9118b424b6 (patch) | |
tree | 831f417b0724dd04cbe075e5e2937c3dde0c4061 /clang/lib/Format/Format.cpp | |
parent | 6c97d979dfe45d5dd14a6aa44cbcc31dde0fc752 (diff) | |
download | bcm5719-llvm-c080917ec2d1b6cb94186875632fec9118b424b6.tar.gz bcm5719-llvm-c080917ec2d1b6cb94186875632fec9118b424b6.zip |
Replace llvm::error_code with std::error_code.
llvm-svn: 210780
Diffstat (limited to 'clang/lib/Format/Format.cpp')
-rw-r--r-- | clang/lib/Format/Format.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 6b57b184d2a..176cb49df8e 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -465,7 +465,7 @@ bool getPredefinedStyle(StringRef Name, FormatStyle::LanguageKind Language, return true; } -llvm::error_code parseConfiguration(StringRef Text, FormatStyle *Style) { +std::error_code parseConfiguration(StringRef Text, FormatStyle *Style) { assert(Style); FormatStyle::LanguageKind Language = Style->Language; assert(Language != FormatStyle::LK_None); @@ -2025,7 +2025,7 @@ FormatStyle getStyle(StringRef StyleName, StringRef FileName, if (StyleName.startswith("{")) { // Parse YAML/JSON style from the command line. - if (llvm::error_code ec = parseConfiguration(StyleName, &Style)) { + if (std::error_code ec = parseConfiguration(StyleName, &Style)) { llvm::errs() << "Error parsing -style: " << ec.message() << ", using " << FallbackStyle << " style\n"; } @@ -2066,12 +2066,12 @@ FormatStyle getStyle(StringRef StyleName, StringRef FileName, if (IsFile) { std::unique_ptr<llvm::MemoryBuffer> Text; - if (llvm::error_code ec = + if (std::error_code ec = llvm::MemoryBuffer::getFile(ConfigFile.c_str(), Text)) { llvm::errs() << ec.message() << "\n"; break; } - if (llvm::error_code ec = parseConfiguration(Text->getBuffer(), &Style)) { + if (std::error_code ec = parseConfiguration(Text->getBuffer(), &Style)) { if (ec == ParseError::Unsuitable) { if (!UnsuitableConfigFiles.empty()) UnsuitableConfigFiles.append(", "); |