6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-06 23:32:27 +00:00
Code Issues Projects Releases Wiki Activity

llvm-cov: Explicitly namespace llvm::make_unique to keep MSVC happy

Browse Source 
This is a followup to r208171, where a call to make_unique was
disambiguated for MSVC. Disambiguate two more calls, and remove the
comment about it since this is what we do everywhere.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208219 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Justin Bogner 2014-05-07 16:01:27 +00:00
parent 6cf16a40d3
commit 459a8aaee2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/IR/GCOV.cpp
View File

@ -511,16 +511,14 @@ std::string FileInfo::getCoveragePath(StringRef Filename,
std::unique_ptr<raw_ostream> std::unique_ptr<raw_ostream>
FileInfo::openCoveragePath(StringRef CoveragePath) { FileInfo::openCoveragePath(StringRef CoveragePath) {
if (Options.NoOutput) if (Options.NoOutput)
return make_unique<raw_null_ostream>(); return llvm::make_unique<raw_null_ostream>();
std::string ErrorInfo; std::string ErrorInfo;
// 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(), auto OS = llvm::make_unique<raw_fd_ostream>(CoveragePath.str().c_str(),
ErrorInfo, sys::fs::F_Text); ErrorInfo, sys::fs::F_Text);
if (!ErrorInfo.empty()) { if (!ErrorInfo.empty()) {
errs() << ErrorInfo << "\n"; errs() << ErrorInfo << "\n";
return make_unique<raw_null_ostream>(); return llvm::make_unique<raw_null_ostream>();
} }
return std::move(OS); return std::move(OS);
} }