浏览代码

Remove unneeded functions.

Sam Jaffe 5 年之前
父节点
当前提交
8421da3405
共有 2 个文件被更改,包括 5 次插入7 次删除
  1. 0 2
      include/iterator/detail/recursive_iterator_base.hpp
  2. 5 5
      test/recursive_iterator_accessors_test.cxx

+ 0 - 2
include/iterator/detail/recursive_iterator_base.hpp

@@ -25,7 +25,6 @@ namespace iterator { namespace detail {
     recursive_iterator_base(super const & iter) : super(iter) {}
     recursive_iterator_base(super && iter) : super(std::move(iter)) {}
     recursive_iterator_base() = default;
-    operator super() const { return *this; }
 
   protected:
     typename super::reference get() const { return super::operator*(); }
@@ -65,7 +64,6 @@ namespace iterator { namespace detail {
     recursive_iterator_base(super const & iter) : super(iter) {}
     recursive_iterator_base(super && iter) : super(std::move(iter)) {}
     recursive_iterator_base() = default;
-    operator super() const { return *this; }
 
   protected:
     /**

+ 5 - 5
test/recursive_iterator_accessors_test.cxx

@@ -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)());
 }