File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ namespace iter {
5252
5353
5454 template <typename Container, typename DifferenceType>
55- class Slice : public IterBase <Container> {
55+ class Slice {
5656 private:
5757 Container & container;
5858 DifferenceType start;
@@ -65,9 +65,9 @@ namespace iter {
6565 // template <typename T>
6666 // friend Slice<std::initializer_list<T>> slice(std::initializer_list<T> &&);
6767
68- using typename IterBase<Container>::contained_iter_type;
68+
6969
70- using typename IterBase<Container>::contained_iter_ret;
70+
7171
7272
7373 public:
@@ -99,21 +99,21 @@ namespace iter {
9999
100100 class Iterator {
101101 private:
102- contained_iter_type sub_iter;
102+ iterator_type<Container> sub_iter;
103103 DifferenceType current;
104104 const DifferenceType stop;
105105 const DifferenceType step;
106106
107107 public:
108- Iterator (contained_iter_type si, DifferenceType start,
108+ Iterator (iterator_type<Container> si, DifferenceType start,
109109 DifferenceType stop, DifferenceType step) :
110110 sub_iter (si),
111111 current (start),
112112 stop (stop),
113113 step (step)
114114 { }
115115
116- contained_iter_ret operator *() const {
116+ iterator_deref<Container> operator *() const {
117117 return *this ->sub_iter ;
118118 }
119119
You can’t perform that action at this time.
0 commit comments