]> granicus.if.org Git - llvm/commitdiff
Avoid potential ADL ambiguity between llvm::make_unique and std::make_unique (when...
authorDavid Blaikie <dblaikie@gmail.com>
Mon, 20 Mar 2017 16:35:33 +0000 (16:35 +0000)
committerDavid Blaikie <dblaikie@gmail.com>
Mon, 20 Mar 2017 16:35:33 +0000 (16:35 +0000)
Patch by Moritz Kiefer!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298266 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/IR/PassManagerInternal.h

index 02f21675fa9d0d84a04a675c0c2fa3cb97cfecae..387dc4c65c4331760dc676ee11348fbb1fd5d15c 100644 (file)
@@ -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.