diff options
| -rw-r--r-- | llvm/include/llvm/ADT/iterator.h | 4 | ||||
| -rw-r--r-- | llvm/unittests/ADT/IteratorTest.cpp | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/llvm/include/llvm/ADT/iterator.h b/llvm/include/llvm/ADT/iterator.h index 781dd1ec3ba..549c5221173 100644 --- a/llvm/include/llvm/ADT/iterator.h +++ b/llvm/include/llvm/ADT/iterator.h @@ -288,7 +288,7 @@ template <typename WrappedIteratorT, decltype(**std::declval<WrappedIteratorT>())>::type> struct pointee_iterator : iterator_adaptor_base< - pointee_iterator<WrappedIteratorT>, WrappedIteratorT, + pointee_iterator<WrappedIteratorT, T>, WrappedIteratorT, typename std::iterator_traits<WrappedIteratorT>::iterator_category, T> { pointee_iterator() = default; @@ -311,7 +311,7 @@ make_pointee_range(RangeT &&Range) { template <typename WrappedIteratorT, typename T = decltype(&*std::declval<WrappedIteratorT>())> class pointer_iterator - : public iterator_adaptor_base<pointer_iterator<WrappedIteratorT>, + : public iterator_adaptor_base<pointer_iterator<WrappedIteratorT, T>, WrappedIteratorT, T> { mutable T Ptr; diff --git a/llvm/unittests/ADT/IteratorTest.cpp b/llvm/unittests/ADT/IteratorTest.cpp index 341049a6847..3bcdfa90846 100644 --- a/llvm/unittests/ADT/IteratorTest.cpp +++ b/llvm/unittests/ADT/IteratorTest.cpp @@ -128,6 +128,20 @@ TEST(PointeeIteratorTest, Range) { EXPECT_EQ(A[I++], II); } +TEST(PointeeIteratorTest, PointeeType) { + struct S { + int X; + bool operator==(const S &RHS) const { return X == RHS.X; }; + }; + S A[] = {S{0}, S{1}}; + SmallVector<S *, 2> V{&A[0], &A[1]}; + + pointee_iterator<SmallVectorImpl<S *>::const_iterator, const S> I = V.begin(); + for (int j = 0; j < 2; ++j, ++I) { + EXPECT_EQ(*V[j], *I); + } +} + TEST(FilterIteratorTest, Lambda) { auto IsOdd = [](int N) { return N % 2 == 1; }; int A[] = {0, 1, 2, 3, 4, 5, 6}; |
