Skip to content

Commit

Permalink
ADT: Fix build after r281182
Browse files Browse the repository at this point in the history
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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@281183 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
dexonsmith committed Sep 11, 2016
1 parent 5de5554 commit 8650ea1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions include/llvm/ADT/AllocatorList.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ template <class T, class AllocatorT> class AllocatorList : AllocatorT {
typedef iterator_adaptor_base<IteratorImpl<ValueT, IteratorBase>,
IteratorBase, std::bidirectional_iterator_tag,
ValueT>
iterator_adaptor_base;
base_type;

public:
typedef ValueT value_type;
Expand All @@ -98,15 +98,15 @@ template <class T, class AllocatorT> class AllocatorList : AllocatorT {
IteratorImpl &operator=(const 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>
IteratorImpl(const IteratorImpl<OtherValueT, OtherIteratorBase> &X,
typename std::enable_if<std::is_convertible<
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*(); }

friend bool operator==(const IteratorImpl &L, const IteratorImpl &R) {
Expand Down

0 comments on commit 8650ea1

Please sign in to comment.