diff options
author | Justin Bogner <mail@justinbogner.com> | 2014-05-07 16:01:27 +0000 |
---|---|---|
committer | Justin Bogner <mail@justinbogner.com> | 2014-05-07 16:01:27 +0000 |
commit | 459a8aaee2e590e54fb94708c147a9248777c899 (patch) | |
tree | 1700568cc38491e2b88c0b9077afca019cb05f9d /lib/IR/GCOV.cpp | |
parent | 6cf16a40d30b4115bf19cc7c693efddecbf0186b (diff) | |
download | llvm-459a8aaee2e590e54fb94708c147a9248777c899.tar.gz llvm-459a8aaee2e590e54fb94708c147a9248777c899.tar.bz2 llvm-459a8aaee2e590e54fb94708c147a9248777c899.tar.xz |
llvm-cov: Explicitly namespace llvm::make_unique to keep MSVC happy
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
Diffstat (limited to 'lib/IR/GCOV.cpp')
-rw-r--r-- | lib/IR/GCOV.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp index e8d26e0d9e..f2099d6baf 100644 --- a/lib/IR/GCOV.cpp +++ b/lib/IR/GCOV.cpp @@ -511,16 +511,14 @@ std::string FileInfo::getCoveragePath(StringRef Filename, std::unique_ptr<raw_ostream> FileInfo::openCoveragePath(StringRef CoveragePath) { if (Options.NoOutput) - return make_unique<raw_null_ostream>(); + return llvm::make_unique<raw_null_ostream>(); 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(), ErrorInfo, sys::fs::F_Text); if (!ErrorInfo.empty()) { errs() << ErrorInfo << "\n"; - return make_unique<raw_null_ostream>(); + return llvm::make_unique<raw_null_ostream>(); } return std::move(OS); } |