diff options
| author | David Blaikie <dblaikie@gmail.com> | 2017-03-20 16:35:33 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2017-03-20 16:35:33 +0000 |
| commit | 820a833125df70771f8f33a0bad3909e03458d12 (patch) | |
| tree | d82acc61d43cee9d79c55f8de6a02efc66b572d3 /llvm | |
| parent | 1e124e18259b7bf96e5cec00abf227091a949b74 (diff) | |
| download | bcm5719-llvm-820a833125df70771f8f33a0bad3909e03458d12.tar.gz bcm5719-llvm-820a833125df70771f8f33a0bad3909e03458d12.zip | |
Avoid potential ADL ambiguity between llvm::make_unique and std::make_unique (when building as C++14+)
Patch by Moritz Kiefer!
llvm-svn: 298266
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/IR/PassManagerInternal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/include/llvm/IR/PassManagerInternal.h b/llvm/include/llvm/IR/PassManagerInternal.h index 02f21675fa9..387dc4c65c4 100644 --- a/llvm/include/llvm/IR/PassManagerInternal.h +++ b/llvm/include/llvm/IR/PassManagerInternal.h @@ -291,7 +291,7 @@ struct AnalysisPassModel : AnalysisPassConcept<IRUnitT, PreservedAnalysesT, AnalysisResultConcept<IRUnitT, PreservedAnalysesT, InvalidatorT>> run(IRUnitT &IR, AnalysisManager<IRUnitT, ExtraArgTs...> &AM, ExtraArgTs... ExtraArgs) override { - return make_unique<ResultModelT>(Pass.run(IR, AM, ExtraArgs...)); + return llvm::make_unique<ResultModelT>(Pass.run(IR, AM, ExtraArgs...)); } /// \brief The model delegates to a static \c PassT::name method. |
