From 3eabc872d4f662277d784a5840850e2118021ecd Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Tue, 10 Oct 2017 18:35:15 +0200 Subject: [PATCH] simplified the const iterators --- src/list.hh | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/src/list.hh b/src/list.hh index 12ffe7f..1e303ae 100644 --- a/src/list.hh +++ b/src/list.hh @@ -24,9 +24,11 @@ private: public: class iterator; - class const_iterator; + // class const_iterator; + using const_iterator = const iterator; class reverse_iterator; - class const_reverse_iterator; + // class const_reverse_iterator; + using const_reverse_iterator = const reverse_iterator; ///////////////////////////////////////////////////////////////////////////// // Member functions // @@ -337,25 +339,6 @@ public: T operator*() { return it->x; } }; - class const_iterator : protected iterator { - public: - const_iterator() : iterator() {} - explicit const_iterator(T *point) : iterator(point) {} - - explicit const_iterator(const iterator &other) : iterator(other) {} - const_iterator(const const_iterator &other) : iterator(other) {} - - explicit const_iterator(iterator &&other) : iterator(std::move(other)) {} - const_iterator(const_iterator &&other) : iterator(std::move(other)) {} - - const_iterator &operator++() = delete; - const_iterator operator++(int) = delete; - const_iterator &operator--() = delete; - const_iterator operator--(int) = delete; - - ~const_iterator() {} - }; - class reverse_iterator : protected iterator { public: reverse_iterator() : iterator() {} @@ -389,25 +372,6 @@ public: ~reverse_iterator() {} }; - - class const_reverse_iterator : protected iterator { - public: - const_reverse_iterator() : iterator() {} - explicit const_reverse_iterator(T *point) : iterator(point) {} - - const_reverse_iterator(const const_reverse_iterator &other) - : iterator(other) {} - - const_reverse_iterator(const_reverse_iterator &&other) - : iterator(std::move(other)) {} - - const_reverse_iterator &operator++() = delete; - const_reverse_iterator &operator++(int) = delete; - const_reverse_iterator &operator--() = delete; - const_reverse_iterator &operator--(int) = delete; - - ~const_reverse_iterator() {} - }; }; } // namespace phundrak