[llvm] r298266 - Avoid potential ADL ambiguity between llvm::make_unique and std::make_unique (when building as C++14+)

[David Blaikie via llvm-commits]

Author: dblaikie
Date: Mon Mar 20 11:35:33 2017
New Revision: 298266

URL: http://llvm.org/viewvc/llvm-project?rev=298266&view=rev
Log:
Avoid potential ADL ambiguity between llvm::make_unique and std::make_unique (when building as C++14+)

Patch by Moritz Kiefer!

Modified:
    llvm/trunk/include/llvm/IR/PassManagerInternal.h

Modified: llvm/trunk/include/llvm/IR/PassManagerInternal.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/PassManagerInternal.h?rev=298266&r1=298265&r2=298266&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/PassManagerInternal.h (original)
+++ llvm/trunk/include/llvm/IR/PassManagerInternal.h Mon Mar 20 11:35:33 2017
@@ -291,7 +291,7 @@ struct AnalysisPassModel : AnalysisPassC
       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.