maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Try to make VS 2012 happy after r217155 

It was failing with:

C:\bb-win7\ninja-clang-i686-msc17-R\llvm-project\llvm\include\llvm/Support/ErrorOr.h(102) : error C3861: 'make_error_code': identifier not found

        C:\bb-win7\ninja-clang-i686-msc17-R\llvm-project\clang-tools-extra\clang-tidy\ClangTidyOptions.cpp(153) : see reference to function template instantiation 'llvm::ErrorOr<T>::ErrorOr<std::errc::errc>(E,void *)' being compiled

        with
        [
            T=clang::tidy::ClangTidyOptions,
            E=std::errc::errc
        ]

llvm-svn: 217201
This commit is contained in:
Hans Wennborg 2014-09-04 22:41:03 +00:00
parent 93dbeae0f7
commit fece4c6cd5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
View File

@ -10,6 +10,7 @@
#include "ClangTidyOptions.h"
#include "clang/Basic/LLVM.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/Errc.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
@ -137,7 +138,7 @@ const ClangTidyOptions &FileOptionsProvider::getOptions(StringRef FileName) {
}
return CachedOptions.GetOrCreateValue(Path, *Result).getValue();
}
if (Result.getError() != std::errc::no_such_file_or_directory) {
if (Result.getError() != llvm::errc::no_such_file_or_directory) {
llvm::errs() << "Error reading " << ConfigFileName << " from " << Path
<< ": " << Result.getError().message() << "\n";
}
@ -150,7 +151,7 @@ FileOptionsProvider::TryReadConfigFile(StringRef Directory) {
ClangTidyOptions Options = DefaultOptionsProvider::getOptions(Directory);
if (!llvm::sys::fs::is_directory(Directory))
return std::errc::not_a_directory;
return make_error_code(llvm::errc::not_a_directory);
SmallString<128> ConfigFile(Directory);
llvm::sys::path::append(ConfigFile, ".clang-tidy");
@ -162,7 +163,7 @@ FileOptionsProvider::TryReadConfigFile(StringRef Directory) {
llvm::sys::fs::is_regular_file(Twine(ConfigFile), IsFile);
if (!IsFile)
return std::errc::no_such_file_or_directory;
return make_error_code(llvm::errc::no_such_file_or_directory);
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> Text =
llvm::MemoryBuffer::getFile(ConfigFile.c_str());