[llvm] r208171 - Work-around MSVS build breakage due to r208148

[Timur Iskhodzhanov]

Author: timurrrr
Date: Wed May  7 03:52:13 2014
New Revision: 208171

URL: http://llvm.org/viewvc/llvm-project?rev=208171&view=rev
Log:
Work-around MSVS build breakage due to r208148

Modified:
    llvm/trunk/lib/IR/GCOV.cpp

Modified: llvm/trunk/lib/IR/GCOV.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/GCOV.cpp?rev=208171&r1=208170&r2=208171&view=diff
==============================================================================
--- llvm/trunk/lib/IR/GCOV.cpp (original)
+++ llvm/trunk/lib/IR/GCOV.cpp Wed May  7 03:52:13 2014
@@ -514,8 +514,10 @@ FileInfo::openCoveragePath(StringRef Cov
     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>();