MSVC complains about this being ambiguous.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254782 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2015-12-04 22:26:21 +00:00
parent c5aab87e68
commit f8e0f06f7c

View File

@ -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)