MSVC complains about this being ambiguous.

llvm-svn: 254782
2015-12-04 22:26:21 +00:00
parent a0b75d7eb4
commit f85e9729e9
1 changed files with 2 additions and 2 deletions
--- a/llvm/lib/LTO/LTOCodeGenerator.cpp
+++ b/llvm/lib/LTO/LTOCodeGenerator.cpp
@@ -124,8 +124,8 @@ void LTOCodeGenerator::setModule(std::unique_ptr<LTOModule> Mod) {
  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)