projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MSVC complains about this being ambiguous.
[oota-llvm.git]
/
lib
/
LTO
/
LTOCodeGenerator.cpp
diff --git
a/lib/LTO/LTOCodeGenerator.cpp
b/lib/LTO/LTOCodeGenerator.cpp
index 25c150b27840b39e3a1eb5903ccdac4bfca26052..bf3cde59443d42454bb7303f5f6883843f97d38d 100644
(file)
--- a/
lib/LTO/LTOCodeGenerator.cpp
+++ b/
lib/LTO/LTOCodeGenerator.cpp
@@
-124,8
+124,8
@@
void LTOCodeGenerator::setModule(std::unique_ptr<LTOModule> Mod) {
AsmUndefinedRefs.clear();
MergedModule = Mod->takeModule();
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)
const std::vector<const char*> &Undefs = Mod->getAsmUndefinedRefs();
for (int I = 0, E = Undefs.size(); I != E; ++I)