Work-around MSVS build breakage due to r208148

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208171 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Timur Iskhodzhanov 2014-05-07 08:52:13 +00:00
parent 227c4c6185
commit 88ab50c237

View File

@ -514,8 +514,10 @@ FileInfo::openCoveragePath(StringRef CoveragePath) {
return make_unique<raw_null_ostream>();
std::string ErrorInfo;
auto OS = make_unique<raw_fd_ostream>(CoveragePath.str().c_str(), ErrorInfo,
sys::fs::F_Text);
// FIXME: When using MSVS, we end up having both std::make_unique and
// 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()) {
errs() << ErrorInfo << "\n";
return make_unique<raw_null_ostream>();