[llvm] r254782 - MSVC complains about this being ambiguous.

Rafael Espindola via llvm-commits llvm-commits at lists.llvm.org
Fri Dec 4 14:26:22 PST 2015


Author: rafael
Date: Fri Dec  4 16:26:21 2015
New Revision: 254782

URL: http://llvm.org/viewvc/llvm-project?rev=254782&view=rev
Log:
MSVC complains about this being ambiguous.

Modified:
    llvm/trunk/lib/LTO/LTOCodeGenerator.cpp

Modified: llvm/trunk/lib/LTO/LTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LTO/LTOCodeGenerator.cpp?rev=254782&r1=254781&r2=254782&view=diff
==============================================================================
--- llvm/trunk/lib/LTO/LTOCodeGenerator.cpp (original)
+++ llvm/trunk/lib/LTO/LTOCodeGenerator.cpp Fri Dec  4 16:26:21 2015
@@ -124,8 +124,8 @@ void LTOCodeGenerator::setModule(std::un
   AsmUndefinedRefs.clear();
 
   MergedModule = Mod->takeModule();
-  IRLinker =
-      make_unique<Linker>(*MergedModule, IRLinker->getDiagnosticHandler());
+  IRLinker = llvm::make_unique<Linker>(*MergedModule,
+                                       IRLinker->getDiagnosticHandler());
 
   const std::vector<const char*> &Undefs = Mod->getAsmUndefinedRefs();
   for (int I = 0, E = Undefs.size(); I != E; ++I)




More information about the llvm-commits mailing list