[llvm] r258204 - [Orc] Qualify call to make_unique to avoid ambiguity with std::make_unique.

Lang Hames via llvm-commits llvm-commits at lists.llvm.org
Tue Jan 19 14:22:44 PST 2016


Author: lhames
Date: Tue Jan 19 16:22:43 2016
New Revision: 258204

URL: http://llvm.org/viewvc/llvm-project?rev=258204&view=rev
Log:
[Orc] Qualify call to make_unique to avoid ambiguity with std::make_unique.

This should fix some of the bot failures associated with r258185.

Modified:
    llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h

Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h?rev=258204&r1=258203&r2=258204&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h Tue Jan 19 16:22:43 2016
@@ -105,10 +105,10 @@ private:
                             FinalizerFtor Finalizer,
                             bool ProcessAllSections)
       : MemMgr(std::move(MemMgr)),
-        PFC(make_unique<PreFinalizeContents>(std::move(Objects),
-                                             std::move(Resolver),
-                                             std::move(Finalizer),
-                                             ProcessAllSections)) {
+        PFC(llvm::make_unique<PreFinalizeContents>(std::move(Objects),
+                                                   std::move(Resolver),
+                                                   std::move(Finalizer),
+                                                   ProcessAllSections)) {
       buildInitialSymbolTable(PFC->Objects);
     }
 




More information about the llvm-commits mailing list