|
|
@@ -22,14 +22,14 @@ TEST(RecursiveIteratorTest, CannotArrowMap) {
|
|
|
TEST(RecursiveIteratorTest, CanAccessOuterterator) {
|
|
|
std::map<int, std::vector<int>> obj{{1, {{0, 1}}}, {2, {{2, 3}}}};
|
|
|
auto rit = make_recursive_iterator(obj);
|
|
|
- auto inner = iterator::end_aware_iterator<decltype(obj)::iterator>(rit);
|
|
|
+ iterator::end_aware_iterator<decltype(obj)::iterator> inner = rit;
|
|
|
EXPECT_THAT(&std::get<0>(*rit), &(inner->first));
|
|
|
}
|
|
|
|
|
|
TEST(RecursiveIteratorTest, CanAccessInnerIterator) {
|
|
|
std::map<int, std::vector<int>> obj{{1, {{0, 1}}}, {2, {{2, 3}}}};
|
|
|
auto rit = make_recursive_iterator(obj);
|
|
|
- auto inner = iterator::end_aware_iterator<std::vector<int>::iterator>(rit);
|
|
|
+ iterator::end_aware_iterator<std::vector<int>::iterator> inner = rit;
|
|
|
EXPECT_THAT(&std::get<1>(*rit), &*inner);
|
|
|
}
|
|
|
|
|
|
@@ -126,10 +126,10 @@ TEST(BoundedRecursiveIteratorTest, EmptyCtorIsEnd) {
|
|
|
{1, {{{1, 1}}, {{2, 2}}}}, // 2 1-element maps
|
|
|
{2, {{{3, 3}, {4, 4}}}} // 1 2-element map
|
|
|
};
|
|
|
- auto rit = make_recursive_iterator<2>(obj);
|
|
|
+ auto rit = make_recursive_iterator<3>(obj);
|
|
|
EXPECT_THAT(rit, testing::Ne(decltype(rit)()));
|
|
|
- EXPECT_THAT(std::distance(rit, decltype(rit)()), 3);
|
|
|
- std::advance(rit, 3);
|
|
|
+ EXPECT_THAT(std::distance(rit, decltype(rit)()), 4);
|
|
|
+ std::advance(rit, 4);
|
|
|
EXPECT_THAT(rit, decltype(rit)());
|
|
|
}
|
|
|
|