[llvm] r357750 - Fix MSVC build for r357749

Pavel Labath via llvm-commits llvm-commits at lists.llvm.org
Fri Apr 5 01:26:58 PDT 2019


Author: labath
Date: Fri Apr  5 01:26:58 2019
New Revision: 357750

URL: http://llvm.org/viewvc/llvm-project?rev=357750&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/ObjectYAML/MinidumpYAML.cpp

Modified: llvm/trunk/lib/ObjectYAML/MinidumpYAML.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/MinidumpYAML.cpp?rev=357750&r1=357749&r2=357750&view=diff
==============================================================================
--- llvm/trunk/lib/ObjectYAML/MinidumpYAML.cpp (original)
+++ llvm/trunk/lib/ObjectYAML/MinidumpYAML.cpp Fri Apr  5 01:26:58 2019
@@ -421,8 +421,8 @@ Stream::create(const Directory &StreamDe
   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 &StreamDe
     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!");




More information about the llvm-commits mailing list