Browse Source

Removing unneeded default destructors.
Fixing range_stream's begin() and end().

Samuel Jaffe 8 years ago
parent
commit
13e8cb1a51
4 changed files with 5 additions and 6 deletions
  1. 1 1
      streams/filter.hpp
  2. 0 1
      streams/join.hpp
  3. 1 1
      streams/map.hpp
  4. 3 3
      streams/source.hpp

+ 1 - 1
streams/filter.hpp

@@ -11,7 +11,7 @@ namespace stream { namespace detail {
       , end_(std::forward<::stream::iterator<T>>(end)) {
         advance();
       }
-      ~iterator() {}
+
       T operator*() { return mem_; }
       
       iterator& operator++() {

+ 0 - 1
streams/join.hpp

@@ -46,7 +46,6 @@ namespace stream { namespace detail {
         return *this;
       }
       
-      ~iterator() {}
       typename C::value_type operator*() { return *curr_; }
       
       iterator& operator++() {

+ 1 - 1
streams/map.hpp

@@ -7,7 +7,7 @@ namespace stream { namespace detail {
     public:
       iterator(std::function<R(T const&)> f, ::stream::iterator<T>&& impl)
       : fun_(f), impl_(std::forward<::stream::iterator<T>>(impl)) {}
-      ~iterator() {}
+
       R operator*() { return fun_(*impl_); }
       DELEGATE_ITERATOR_IMPL(impl_)
     private:

+ 3 - 3
streams/source.hpp

@@ -8,7 +8,7 @@ namespace stream {
       public:
         using value_type = typename std::iterator_traits<Iter>::reference;
         explicit iterator(Iter it) : impl_(it) {}
-        ~iterator() {}
+
         value_type operator*() { return *impl_; }
         DELEGATE_ITERATOR_IMPL(impl_)
       private:
@@ -40,8 +40,8 @@ namespace stream {
       
       explicit range_stream(It b, It e) : begin_(b), end_(e) {}
       ~range_stream() override {}
-      iterator<reference> begin() override { return {new source::iterator<It>{begin_}}; }
-      iterator<reference> end() override { return {new source::iterator<It>{end_}}; }
+      iterator<reference> begin() { return {source::iterator<It>{begin_}}; }
+      iterator<reference> end() { return {source::iterator<It>{end_}}; }
     private:
       It begin_, end_;
     };