From: Pavel Labath <pavel@labath.sk>
Date: Fri, 5 Apr 2019 08:26:58 +0000 (+0000)
Subject: Fix MSVC build for r357749
X-Git-Tag: llvmorg-10-init~8420
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a6dd1e68351b7f6bac5d2818addf7e1550d910d;p=platform%2Fupstream%2Fllvm.git

Fix MSVC build for r357749

MSVC found the bare "make_unique" invocation ambiguous (between std::
and llvm:: versions). Explicitly qualifying the call with llvm:: should
hopefully fix it.

llvm-svn: 357750
---

diff --git a/llvm/lib/ObjectYAML/MinidumpYAML.cpp b/llvm/lib/ObjectYAML/MinidumpYAML.cpp
index 38d23d9..db7431b 100644
--- a/llvm/lib/ObjectYAML/MinidumpYAML.cpp
+++ b/llvm/lib/ObjectYAML/MinidumpYAML.cpp
@@ -421,8 +421,8 @@ Stream::create(const Directory &StreamDesc, const object::MinidumpFile &File) {
   StreamKind Kind = getKind(StreamDesc.Type);
   switch (Kind) {
   case StreamKind::RawContent:
-    return make_unique<RawContentStream>(StreamDesc.Type,
-                                         File.getRawStream(StreamDesc));
+    return llvm::make_unique<RawContentStream>(StreamDesc.Type,
+                                               File.getRawStream(StreamDesc));
   case StreamKind::SystemInfo: {
     auto ExpectedInfo = File.getSystemInfo();
     if (!ExpectedInfo)
@@ -430,11 +430,11 @@ Stream::create(const Directory &StreamDesc, const object::MinidumpFile &File) {
     auto ExpectedCSDVersion = File.getString(ExpectedInfo->CSDVersionRVA);
     if (!ExpectedCSDVersion)
       return ExpectedInfo.takeError();
-    return make_unique<SystemInfoStream>(*ExpectedInfo,
-                                         std::move(*ExpectedCSDVersion));
+    return llvm::make_unique<SystemInfoStream>(*ExpectedInfo,
+                                               std::move(*ExpectedCSDVersion));
   }
   case StreamKind::TextContent:
-    return make_unique<TextContentStream>(
+    return llvm::make_unique<TextContentStream>(
         StreamDesc.Type, toStringRef(File.getRawStream(StreamDesc)));
   }
   llvm_unreachable("Unhandled stream kind!");