]> granicus.if.org Git - llvm/commitdiff
Fix MSVC build for r357749
authorPavel Labath <pavel@labath.sk>
Fri, 5 Apr 2019 08:26:58 +0000 (08:26 +0000)
committerPavel Labath <pavel@labath.sk>
Fri, 5 Apr 2019 08:26:58 +0000 (08:26 +0000)
MSVC found the bare "make_unique" invocation ambiguous (between std::
and llvm:: versions). Explicitly qualifying the call with llvm:: should
hopefully fix it.

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

lib/ObjectYAML/MinidumpYAML.cpp

index 38d23d9dfc65dcd2bf9a579e7532eadb1253c380..db7431bcf257fa671e57f181b1c0f28037b15989 100644 (file)
@@ -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!");