Made core interface private in iterator_adaptor, added base_reference() for Derived classes.

[SVN r1200]

include/boost/iterator/filter_iterator.hpp

@@ -76,14 +76,14 @@ namespace boost
    private:
       void increment()
       {
-          super_t::increment();
+          ++(this->base_reference());
           satisfy_predicate();
       }
 
       void satisfy_predicate()
       {
           while (this->base() != this->m_end && !this->m_predicate(*this->base()))
-              super_t::increment();
+              ++(this->base_reference());
       }
 
       // Probably should be the initial base class so it can be

include/boost/iterator/iterator_adaptor.hpp

@@ -240,9 +240,22 @@ namespace boost
         { return m_iterator; }
 
    protected:
-      // Core iterator interface for iterator_facade
+      //
-      // 
+      // lvalue access to the Base object for Derived
+      //
+      Base const& base_reference() const
+        { return m_iterator; }
 
+      Base& base_reference()
+        { return m_iterator; }
+
+   private:
+      //
+      // Core iterator interface for iterator_facade.  This is private
+      // to prevent temptation for Derived classes to use it, which
+      // will often result in an error.  Derived classes should use
+      // base_reference(), above, to get direct access to m_iterator.
+      // 
       typename super_t::reference dereference() const
         { return *m_iterator; }
 
@@ -277,10 +290,6 @@ namespace boost
           return y.base() - m_iterator;
       }
 
-      // Needed for counting iterator
-      Base const& base_reference() const
-        { return m_iterator; }
-
    private: // data members
       Base m_iterator;
   };

include/boost/iterator/reverse_iterator.hpp

@@ -20,44 +20,44 @@ namespace boost
   //
   //
   template <class Iterator>
-  class reverse_iterator :
+  class reverse_iterator
-    public iterator_adaptor< reverse_iterator<Iterator>, Iterator >
+      : public iterator_adaptor< reverse_iterator<Iterator>, Iterator >
   {
-    typedef iterator_adaptor< reverse_iterator<Iterator>, Iterator > super_t;
+      typedef iterator_adaptor< reverse_iterator<Iterator>, Iterator > super_t;
 
-    friend class iterator_core_access;
+      friend class iterator_core_access;
 
-  public:
+   public:
-    reverse_iterator() {}
+      reverse_iterator() {}
 
-    explicit reverse_iterator(Iterator x) 
+      explicit reverse_iterator(Iterator x) 
-      : super_t(x) {}
+          : super_t(x) {}
 
-    template<class OtherIterator>
+      template<class OtherIterator>
-    reverse_iterator(
+      reverse_iterator(
-        reverse_iterator<OtherIterator> const& r
+          reverse_iterator<OtherIterator> const& r
-      , typename enable_if_convertible<OtherIterator, Iterator>::type* = 0
+          , typename enable_if_convertible<OtherIterator, Iterator>::type* = 0
-    )
+          )
-      : super_t(r.base())
+          : super_t(r.base())
-    {}
+      {}
 
-  private:
+   private:
-    typename super_t::reference dereference() const { return *boost::prior(this->base()); }
+      typename super_t::reference dereference() const { return *boost::prior(this->base()); }
     
-    void increment() { super_t::decrement(); }
+      void increment() { --this->base_reference(); }
-    void decrement() { super_t::increment(); }
+      void decrement() { ++this->base_reference(); }
 
-    void advance(typename super_t::difference_type n)
+      void advance(typename super_t::difference_type n)
-    {
+      {
-      super_t::advance(-n);
+          this->base_reference() += -n;
-    }
+      }
 
-    template <class OtherIterator>
+      template <class OtherIterator>
-    typename super_t::difference_type
+      typename super_t::difference_type
-    distance_to(reverse_iterator<OtherIterator> const& y) const
+      distance_to(reverse_iterator<OtherIterator> const& y) const
-    {
+      {
-      return -super_t::distance_to(y);
+          return this->base_reference() - y.base();
-    }
+      }
   };
 
   template <class BidirectionalIterator>

include/boost/iterator/transform_iterator.hpp

@@ -12,7 +12,6 @@
 #include <boost/iterator.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/iterator/iterator_categories.hpp>
-#include <boost/result_of.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/is_reference.hpp>
 #include <boost/type_traits/remove_const.hpp>