1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00

Work-around MSVS build breakage due to r208148

llvm-svn: 208171
This commit is contained in:
Timur Iskhodzhanov 2014-05-07 08:52:13 +00:00
parent 4a872de9c5
commit c86abd0b7b

View File

@ -514,8 +514,10 @@ FileInfo::openCoveragePath(StringRef CoveragePath) {
return make_unique<raw_null_ostream>(); return make_unique<raw_null_ostream>();
std::string ErrorInfo; std::string ErrorInfo;
auto OS = make_unique<raw_fd_ostream>(CoveragePath.str().c_str(), ErrorInfo, // FIXME: When using MSVS, we end up having both std::make_unique and
sys::fs::F_Text); // llvm::make_unique which conflict. Explicitly use the llvm:: version.
auto OS = llvm::make_unique<raw_fd_ostream>(CoveragePath.str().c_str(),
ErrorInfo, sys::fs::F_Text);
if (!ErrorInfo.empty()) { if (!ErrorInfo.empty()) {
errs() << ErrorInfo << "\n"; errs() << ErrorInfo << "\n";
return make_unique<raw_null_ostream>(); return make_unique<raw_null_ostream>();