add nested typedefs

[SVN r23644]

include/boost/iterator/iterator_adaptor.hpp

@@ -247,10 +247,10 @@ namespace boost
   {
       friend class iterator_core_access;
 
+   protected:
       typedef typename detail::iterator_adaptor_base<
           Derived, Base, Value, Traversal, Reference, Difference
       >::type super_t;
-
    public:
       iterator_adaptor() {}
 
@@ -263,6 +263,9 @@ namespace boost
         { return m_iterator; }
 
    protected:
+      // for convenience in derived classes
+      typedef iterator_adaptor<Derived,Base,Value,Traversal,Reference,Difference> iterator_adaptor_;
+      
       //
       // lvalue access to the Base object for Derived
       //

include/boost/iterator/iterator_facade.hpp

@@ -586,8 +586,6 @@ namespace boost
       //
       // Curiously Recurring Template interface.
       //
-      typedef Derived derived_t;
-
       Derived& derived()
       {
           return *static_cast<Derived*>(this);
@@ -602,6 +600,10 @@ namespace boost
          Value, CategoryOrTraversal, Reference, Difference
       > associated_types;
 
+   protected:
+      // For use by derived classes
+      typedef iterator_facade<Derived,Value,Reference,Difference> iterator_facade_;
+      
    public:
 
       typedef typename associated_types::value_type value_type;