From: Reid Kleckner <rnk@google.com>
Date: Wed, 19 Jul 2017 23:42:53 +0000 (+0000)
Subject: Use llvm::make_unique once more to avoid ADL ambiguity with std::make_unique
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=318a52d6bf85d2eac6151ca1616a79898040f315;p=llvm

Use llvm::make_unique once more to avoid ADL ambiguity with std::make_unique

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

diff --git a/lib/DebugInfo/DWARF/DWARFContext.cpp b/lib/DebugInfo/DWARF/DWARFContext.cpp
index ac4ab258bba..88efcd8f49c 100644
--- a/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -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));
 }