diff options
| author | Frederic Riss <friss@apple.com> | 2014-09-15 08:23:07 +0000 |
|---|---|---|
| committer | Frederic Riss <friss@apple.com> | 2014-09-15 08:23:07 +0000 |
| commit | 65379c564da27c9acb041026f9f860baff685212 (patch) | |
| tree | e985f900d414cd01897d1507ee0f3d2649de9361 /llvm/lib | |
| parent | a315bd80c21e3967415292864f5bc78e6fd666ed (diff) | |
| download | bcm5719-llvm-65379c564da27c9acb041026f9f860baff685212.tar.gz bcm5719-llvm-65379c564da27c9acb041026f9f860baff685212.zip | |
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.
llvm-svn: 217751
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/DebugInfo/DWARFUnit.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/DebugInfo/DWARFUnit.h b/llvm/lib/DebugInfo/DWARFUnit.h index 24ade008776..e5491954c61 100644 --- a/llvm/lib/DebugInfo/DWARFUnit.h +++ b/llvm/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, |
