summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2017-07-19 23:42:53 +0000
committerReid Kleckner <rnk@google.com>2017-07-19 23:42:53 +0000
commit388f88070eaefaab233f7aeaca98987fd7b042b0 (patch)
tree6c22c61ed4684181e6b3da0ae817aca00a76e158 /llvm/lib
parent2e942fbaefeaf9a6b3df4b475342f146ad44aa01 (diff)
downloadbcm5719-llvm-388f88070eaefaab233f7aeaca98987fd7b042b0.tar.gz
bcm5719-llvm-388f88070eaefaab233f7aeaca98987fd7b042b0.zip
Use llvm::make_unique once more to avoid ADL ambiguity with std::make_unique
llvm-svn: 308552
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFContext.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index ac4ab258bba..88efcd8f49c 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/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));
}
OpenPOWER on IntegriCloud