From 5471ad06e14d47734d89ab5d197695d935d39243 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 12 Jun 2014 20:37:59 +0000 Subject: Refer to error_code with the std prefix. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@210817 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/clang-format/ClangFormat.cpp | 2 +- tools/driver/cc1as_main.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/clang-format/ClangFormat.cpp b/tools/clang-format/ClangFormat.cpp index 189a611d00..e0239499af 100644 --- a/tools/clang-format/ClangFormat.cpp +++ b/tools/clang-format/ClangFormat.cpp @@ -210,7 +210,7 @@ static bool format(StringRef FileName) { new DiagnosticOptions); SourceManager Sources(Diagnostics, Files); std::unique_ptr Code; - if (error_code ec = MemoryBuffer::getFileOrSTDIN(FileName, Code)) { + if (std::error_code ec = MemoryBuffer::getFileOrSTDIN(FileName, Code)) { llvm::errs() << ec.message() << "\n"; return true; } diff --git a/tools/driver/cc1as_main.cpp b/tools/driver/cc1as_main.cpp index 5f020297e9..2b4e97d8d8 100644 --- a/tools/driver/cc1as_main.cpp +++ b/tools/driver/cc1as_main.cpp @@ -282,7 +282,8 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, return Diags.Report(diag::err_target_unknown_triple) << Opts.Triple; std::unique_ptr Buffer; - if (error_code ec = MemoryBuffer::getFileOrSTDIN(Opts.InputFile, Buffer)) { + if (std::error_code ec = + MemoryBuffer::getFileOrSTDIN(Opts.InputFile, Buffer)) { Error = ec.message(); return Diags.Report(diag::err_fe_error_reading) << Opts.InputFile; } -- cgit v1.2.3