RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 05:01:59 +01:00
Code Issues Projects Releases Wiki Activity

ADT: Fix build after r281182

Browse Source 
Fix this bot:
  http://lab.llvm.org:8011/builders/clang-x86_64-linux-abi-test/builds/20680

which complained that a typedef of 'iterator_adaptor_base' changed
meaning in AllocatorList::IteratorImpl.  Use 'base_type' there instead.

llvm-svn: 281183
This commit is contained in:
Duncan P. N. Exon Smith 2016-09-11 22:55:46 +00:00
parent 1af3e8d9df
commit c06db5cb12
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/ADT/AllocatorList.h
View File

@ -86,7 +86,7 @@ private:
typedef iterator_adaptor_base<IteratorImpl<ValueT, IteratorBase>, typedef iterator_adaptor_base<IteratorImpl<ValueT, IteratorBase>,
IteratorBase, std::bidirectional_iterator_tag, IteratorBase, std::bidirectional_iterator_tag,
ValueT> ValueT>
iterator_adaptor_base; base_type;
public: public:
typedef ValueT value_type; typedef ValueT value_type;
@ -98,15 +98,15 @@ private:
IteratorImpl &operator=(const IteratorImpl &) = default; IteratorImpl &operator=(const IteratorImpl &) = default;
~IteratorImpl() = default; ~IteratorImpl() = default;
explicit IteratorImpl(const IteratorBase &I) : iterator_adaptor_base(I) {} explicit IteratorImpl(const IteratorBase &I) : base_type(I) {}
template <class OtherValueT, class OtherIteratorBase> template <class OtherValueT, class OtherIteratorBase>
IteratorImpl(const IteratorImpl<OtherValueT, OtherIteratorBase> &X, IteratorImpl(const IteratorImpl<OtherValueT, OtherIteratorBase> &X,
typename std::enable_if<std::is_convertible< typename std::enable_if<std::is_convertible<
OtherIteratorBase, IteratorBase>::value>::type * = nullptr) OtherIteratorBase, IteratorBase>::value>::type * = nullptr)
: iterator_adaptor_base(X.wrapped()) {} : base_type(X.wrapped()) {}
reference operator*() const { return iterator_adaptor_base::wrapped()->V; } reference operator*() const { return base_type::wrapped()->V; }
pointer operator->() const { return &operator*(); } pointer operator->() const { return &operator*(); }
friend bool operator==(const IteratorImpl &L, const IteratorImpl &R) { friend bool operator==(const IteratorImpl &L, const IteratorImpl &R) {