[llvm] r207146 - [ADT] Generalize pointee_iterator to smart pointers by using decltype.
Chandler Carruth
chandlerc at gmail.com
Thu Apr 24 14:10:35 PDT 2014
Author: chandlerc
Date: Thu Apr 24 16:10:35 2014
New Revision: 207146
URL: http://llvm.org/viewvc/llvm-project?rev=207146&view=rev
Log:
[ADT] Generalize pointee_iterator to smart pointers by using decltype.
Based on review feedback from Dave on the original patch.
Modified:
llvm/trunk/include/llvm/ADT/iterator.h
llvm/trunk/unittests/Support/IteratorTest.cpp
Modified: llvm/trunk/include/llvm/ADT/iterator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/iterator.h?rev=207146&r1=207145&r2=207146&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/iterator.h (original)
+++ llvm/trunk/include/llvm/ADT/iterator.h Thu Apr 24 16:10:35 2014
@@ -163,10 +163,9 @@ public:
/// \code
/// typedef pointee_iterator<SmallVectorImpl<T *>::iterator> iterator;
/// \endcode
-template <
- typename WrappedIteratorT,
- typename T = typename std::remove_pointer<
- typename std::iterator_traits<WrappedIteratorT>::value_type>::type>
+template <typename WrappedIteratorT,
+ typename T = typename std::remove_reference<
+ decltype(**std::declval<WrappedIteratorT>())>::type>
struct pointee_iterator
: iterator_adaptor_base<pointee_iterator<WrappedIteratorT>,
WrappedIteratorT, T> {
Modified: llvm/trunk/unittests/Support/IteratorTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/IteratorTest.cpp?rev=207146&r1=207145&r2=207146&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/IteratorTest.cpp (original)
+++ llvm/trunk/unittests/Support/IteratorTest.cpp Thu Apr 24 16:10:35 2014
@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/ADT/iterator.h"
+#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallVector.h"
#include "gtest/gtest.h"
@@ -27,6 +28,47 @@ TEST(PointeeIteratorTest, Basic) {
test_iterator Begin, End;
Begin = V.begin();
+ End = test_iterator(V.end());
+
+ test_iterator I = Begin;
+ for (int i = 0; i < 4; ++i) {
+ EXPECT_EQ(*V[i], *I);
+
+ EXPECT_EQ(I, Begin + i);
+ EXPECT_EQ(I, std::next(Begin, i));
+ test_iterator J = Begin;
+ J += i;
+ EXPECT_EQ(I, J);
+ EXPECT_EQ(*V[i], Begin[i]);
+
+ EXPECT_NE(I, End);
+ EXPECT_GT(End, I);
+ EXPECT_LT(I, End);
+ EXPECT_GE(I, Begin);
+ EXPECT_LE(Begin, I);
+
+ EXPECT_EQ(i, I - Begin);
+ EXPECT_EQ(i, std::distance(Begin, I));
+ EXPECT_EQ(Begin, I - i);
+
+ test_iterator K = I++;
+ EXPECT_EQ(K, std::prev(I));
+ }
+ EXPECT_EQ(End, I);
+}
+
+TEST(PointeeIteratorTest, SmartPointer) {
+ SmallVector<std::unique_ptr<int>, 4> V;
+ V.push_back(make_unique<int>(1));
+ V.push_back(make_unique<int>(2));
+ V.push_back(make_unique<int>(3));
+ V.push_back(make_unique<int>(4));
+
+ typedef pointee_iterator<
+ SmallVectorImpl<std::unique_ptr<int>>::const_iterator> test_iterator;
+
+ test_iterator Begin, End;
+ Begin = V.begin();
End = test_iterator(V.end());
test_iterator I = Begin;
More information about the llvm-commits
mailing list