From: Yaron Keren <yaron.keren@gmail.com>
Date: Thu, 18 Dec 2014 10:03:35 +0000 (+0000)
Subject: Fix Visual C++ error "'llvm::make_unique' : ambiguous call to overloaded function".
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=80237c11481a4ba93a6d40f3507804673f5ae8a0;p=oota-llvm.git

Fix Visual C++ error "'llvm::make_unique' : ambiguous call to overloaded function".



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224506 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index d4a2c1a298c..e228b1d462d 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -3529,9 +3529,9 @@ std::error_code BitcodeReader::InitStreamFromBuffer() {
 std::error_code BitcodeReader::InitLazyStream() {
   // Check and strip off the bitcode wrapper; BitstreamReader expects never to
   // see it.
-  auto OwnedBytes = make_unique<StreamingMemoryObject>(LazyStreamer);
+  auto OwnedBytes = llvm::make_unique<StreamingMemoryObject>(LazyStreamer);
   StreamingMemoryObject &Bytes = *OwnedBytes;
-  StreamFile = make_unique<BitstreamReader>(std::move(OwnedBytes));
+  StreamFile = llvm::make_unique<BitstreamReader>(std::move(OwnedBytes));
   Stream.init(&*StreamFile);
 
   unsigned char buf[16];