From: Frederic Riss <friss@apple.com>
Date: Mon, 15 Sep 2014 08:23:07 +0000 (+0000)
Subject: Fix ambiguous typedef introduced in r217747.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d090be97a8c477bd63e6b60245288ddff0d04ede;p=oota-llvm.git

Fix ambiguous typedef introduced in r217747.

Use fully qualified name inside a typedef from llvm::iterator_range<...> to
iterator_range. This is reported (rightly I think) by GCC as an
ambiguous name redefinition. Hope this fixes the buildbots.

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

diff --git a/lib/DebugInfo/DWARFUnit.h b/lib/DebugInfo/DWARFUnit.h
index 24ade008776..e5491954c61 100644
--- a/lib/DebugInfo/DWARFUnit.h
+++ b/lib/DebugInfo/DWARFUnit.h
@@ -58,9 +58,9 @@ class DWARFUnitSection : public SmallVector<std::unique_ptr<UnitType>, 1>,
   };
 
 public:
-  typedef SmallVectorImpl<std::unique_ptr<UnitType>> UnitVector;
+  typedef llvm::SmallVectorImpl<std::unique_ptr<UnitType>> UnitVector;
   typedef typename UnitVector::iterator iterator;
-  typedef iterator_range<typename UnitVector::iterator> iterator_range;
+  typedef llvm::iterator_range<typename UnitVector::iterator> iterator_range;
 
   UnitType *getUnitForOffset(uint32_t Offset) const {
     auto *CU = std::lower_bound(this->begin(), this->end(), Offset,