[Boost-commit] svn:boost r56695 - in sandbox/statistics/iterator: boost/iterator libs/iterator/src

Subject: [Boost-commit] svn:boost r56695 - in sandbox/statistics/iterator: boost/iterator libs/iterator/src
From: erwann.rogard_at_[hidden]
Date: 2009-10-09 23:03:42

Author: e_r
Date: 2009-10-09 23:03:42 EDT (Fri, 09 Oct 2009)
New Revision: 56695
URL: http://svn.boost.org/trac/boost/changeset/56695

Log:
m
Text files modified: 
   sandbox/statistics/iterator/boost/iterator/cycle_iterator2_ext.hpp |    19 ++-----------------                     
   sandbox/statistics/iterator/boost/iterator/cycle_iterator_ext.hpp  |    35 +++++++++++++++++++----------------     
   sandbox/statistics/iterator/libs/iterator/src/main.cpp             |     9 ++++++++-                               
   3 files changed, 29 insertions(+), 34 deletions(-)

Modified: sandbox/statistics/iterator/boost/iterator/cycle_iterator2_ext.hpp
==============================================================================
--- sandbox/statistics/iterator/boost/iterator/cycle_iterator2_ext.hpp	(original)
+++ sandbox/statistics/iterator/boost/iterator/cycle_iterator2_ext.hpp	2009-10-09 23:03:42 EDT (Fri, 09 Oct 2009)
@@ -10,6 +10,8 @@
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <iterator>
 
+// See http://www.nabble.com/cycle-iterators-td25215321.html
+
 namespace boost {
 
   //! This is a cycle iterator that does NOT keep track of wraparound.
@@ -46,23 +48,6 @@
       position (other.position)
     {}
 
-    // ER_2009_07
-    template <typename OtherBase, typename OtherOffset>
-    enable_if<
-        is_convertible<OtherBase,BaseIterator>,
-        cycle_iterator2_ext&
-    >
-    operator= (cycle_iterator2_ext<OtherBase,OtherOffset> const& other)
-    {
-        if(&other!=this){
-            super_t& super = static_cast<super_t&>(this);
-            super = other;
-            size = (other.size);
-            position = (other.position);
-        }
-        return *this;
-    }
-
   private:
     friend class boost::iterator_core_access;
   

Modified: sandbox/statistics/iterator/boost/iterator/cycle_iterator_ext.hpp
==============================================================================
--- sandbox/statistics/iterator/boost/iterator/cycle_iterator_ext.hpp	(original)
+++ sandbox/statistics/iterator/boost/iterator/cycle_iterator_ext.hpp	2009-10-09 23:03:42 EDT (Fri, 09 Oct 2009)
@@ -11,6 +11,9 @@
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <iterator>
 
+// See http://www.nabble.com/cycle-iterators-td25215321.html
+
+
 namespace boost {
 
   //! This is a cycle iterator that does keep track of wraparound.
@@ -52,22 +55,22 @@
     {}
 
     // ER_2009_07
-    template <typename OtherBase, typename OtherOffset>
-    enable_if<
-        is_convertible<OtherBase,BaseIterator>,
-        cycle_iterator_ext&
-    >
-    operator= (cycle_iterator_ext<OtherBase,OtherOffset> const& other)
-    {
-        if(&other!=this){
-            super_t& super = static_cast<super_t&>(this);
-            super = other;
-            size = (other.size),
-            position = (other.position),
-            wrap = (other.wrap);
-        }
-        return *this;
-    }
+    //template <typename OtherBase, typename OtherOffset>
+    //typename enable_if<
+    //    is_convertible<OtherBase,BaseIterator>,
+    //    cycle_iterator_ext&
+    //>::type
+    //operator= (cycle_iterator_ext<OtherBase,OtherOffset> const& other)
+    //{
+    //    if(&other!=this){
+    //        super_t& super = static_cast<super_t&>(this);
+    //        super = other;
+    //        size = (other.size),
+    //        position = (other.position),
+    //        wrap = (other.wrap);
+    //    }
+    //    return *this;
+    //}
 
   private:
     friend class boost::iterator_core_access;

Modified: sandbox/statistics/iterator/libs/iterator/src/main.cpp
==============================================================================
--- sandbox/statistics/iterator/libs/iterator/src/main.cpp	(original)
+++ sandbox/statistics/iterator/libs/iterator/src/main.cpp	2009-10-09 23:03:42 EDT (Fri, 09 Oct 2009)
@@ -1,9 +1,16 @@
 #include <iostream>
 #include <libs/iterator/example/range_cycle.h>
+#include <libs/iterator/example/cycle_iter.h>
+#include <libs/iterator/example/tuple_element.h>
+#include <libs/iterator/example/min_iterator.h>
+#include <boost/numeric/detail/min_distance.hpp>
 
 int main () {
 
-    example_range_cycle(std::cout);
+    //example_range_cycle(std::cout);
+    //example_iter(std::cout);
+    //example_tuple_element(std::cout);
+    example_min_iterator(std::cout);
 
     return 0;
 }