[llvm] r308552 - Use llvm::make_unique once more to avoid ADL ambiguity with std::make_unique

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Wed Jul 19 16:42:53 PDT 2017


Author: rnk
Date: Wed Jul 19 16:42:53 2017
New Revision: 308552

URL: http://llvm.org/viewvc/llvm-project?rev=308552&view=rev
Log:
Use llvm::make_unique once more to avoid ADL ambiguity with std::make_unique

Modified:
    llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp

Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp?rev=308552&r1=308551&r2=308552&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp (original)
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp Wed Jul 19 16:42:53 2017
@@ -1252,13 +1252,14 @@ public:
 std::unique_ptr<DWARFContext>
 DWARFContext::create(const object::ObjectFile &Obj, const LoadedObjectInfo *L,
                      function_ref<ErrorPolicy(Error)> HandleError) {
-  auto DObj = make_unique<DWARFObjInMemory>(Obj, L, HandleError);
+  auto DObj = llvm::make_unique<DWARFObjInMemory>(Obj, L, HandleError);
   return llvm::make_unique<DWARFContext>(std::move(DObj));
 }
 
 std::unique_ptr<DWARFContext>
 DWARFContext::create(const StringMap<std::unique_ptr<MemoryBuffer>> &Sections,
                      uint8_t AddrSize, bool isLittleEndian) {
-  auto DObj = make_unique<DWARFObjInMemory>(Sections, AddrSize, isLittleEndian);
+  auto DObj =
+      llvm::make_unique<DWARFObjInMemory>(Sections, AddrSize, isLittleEndian);
   return llvm::make_unique<DWARFContext>(std::move(DObj));
 }




More information about the llvm-commits mailing list