diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-12-04 22:26:21 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-12-04 22:26:21 +0000 |
| commit | f85e9729e94a405c8ff8537f45f361cfd9dda977 (patch) | |
| tree | 4ca46fee273732b523ec5a36591e6d42dd795fa6 /llvm/lib | |
| parent | a0b75d7eb4cdf590d93450d5271f9c597e120ed6 (diff) | |
| download | bcm5719-llvm-f85e9729e94a405c8ff8537f45f361cfd9dda977.tar.gz bcm5719-llvm-f85e9729e94a405c8ff8537f45f361cfd9dda977.zip | |
MSVC complains about this being ambiguous.
llvm-svn: 254782
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/LTO/LTOCodeGenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/LTO/LTOCodeGenerator.cpp b/llvm/lib/LTO/LTOCodeGenerator.cpp index 25c150b2784..bf3cde59443 100644 --- 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) |
