From a37095eae6e887bacbc70f1c67c7becaa40f600b Mon Sep 17 00:00:00 2001 From: Yaron Keren Date: Mon, 6 Oct 2014 06:39:57 +0000 Subject: [PATCH] Resolve ambiguity between llvm::make_unique and std::make_unique. Intorduced in r219098. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@219105 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/DebugInfo/DWARFUnit.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/DebugInfo/DWARFUnit.h b/lib/DebugInfo/DWARFUnit.h index a57bead4750..a4dd276b101 100644 --- a/lib/DebugInfo/DWARFUnit.h +++ b/lib/DebugInfo/DWARFUnit.h @@ -88,8 +88,9 @@ public: DataExtractor Data(Section, LE, 0); uint32_t Offset = 0; while (Data.isValidOffset(Offset)) { - auto U = make_unique(Context, DA, Section, RS, SS, SOS, AOS, &M, - Data.isLittleEndian(), *this); + auto U = + llvm::make_unique(Context, DA, Section, RS, SS, SOS, AOS, + &M, Data.isLittleEndian(), *this); if (!U->extract(Data, &Offset)) break; this->push_back(std::move(U)); -- 2.34.1