From 88ab50c23791442f13c72e331f0505f9fbb5046a Mon Sep 17 00:00:00 2001
From: Timur Iskhodzhanov <timurrrr@google.com>
Date: Wed, 7 May 2014 08:52:13 +0000
Subject: [PATCH] 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
---
 lib/IR/GCOV.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp
index 7a89723d855..e8d26e0d9e1 100644
--- a/lib/IR/GCOV.cpp
+++ b/lib/IR/GCOV.cpp
@@ -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>();