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);
 }