[llvm] r219105 - Resolve ambiguity between llvm::make_unique and std::make_unique.

Yaron Keren yaron.keren at gmail.com
Sun Oct 5 23:39:57 PDT 2014


Author: yrnkrn
Date: Mon Oct  6 01:39:57 2014
New Revision: 219105

URL: http://llvm.org/viewvc/llvm-project?rev=219105&view=rev
Log:
Resolve ambiguity between llvm::make_unique and std::make_unique.

Intorduced in r219098.
 

Modified:
    llvm/trunk/lib/DebugInfo/DWARFUnit.h

Modified: llvm/trunk/lib/DebugInfo/DWARFUnit.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARFUnit.h?rev=219105&r1=219104&r2=219105&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/DWARFUnit.h (original)
+++ llvm/trunk/lib/DebugInfo/DWARFUnit.h Mon Oct  6 01:39:57 2014
@@ -88,8 +88,9 @@ public:
     DataExtractor Data(Section, LE, 0);
     uint32_t Offset = 0;
     while (Data.isValidOffset(Offset)) {
-      auto U = make_unique<UnitType>(Context, DA, Section, RS, SS, SOS, AOS, &M,
-                                     Data.isLittleEndian(), *this);
+      auto U =
+          llvm::make_unique<UnitType>(Context, DA, Section, RS, SS, SOS, AOS,
+                                      &M, Data.isLittleEndian(), *this);
       if (!U->extract(Data, &Offset))
         break;
       this->push_back(std::move(U));





More information about the llvm-commits mailing list