Branch at revision 46530

[SVN r46531]

doc/Jamfile.v2

@@ -16,7 +16,5 @@ boostbook standalone
     <xsl:param>toc.max.depth=3
     <xsl:param>toc.section.depth=3
     <xsl:param>chunk.section.depth=4
-    <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/iterator/doc
   ;
 
-

include/boost/iterator/detail/config_def.hpp

@@ -47,7 +47,7 @@
 #endif
 
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)                                       \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x5A0))                   \
+    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x531))                   \
     || (BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 700) && defined(_MSC_VER)) \
     || BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))                \
     || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))

include/boost/iterator/indirect_iterator.hpp

@@ -110,7 +110,7 @@ namespace boost
   private:    
       typename super_t::reference dereference() const
       {
-# if BOOST_WORKAROUND(__BORLANDC__, < 0x5A0 )
+# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
           return const_cast<super_t::reference>(**this->base());
 # else
           return **this->base();

include/boost/iterator/iterator_adaptor.hpp

@@ -24,14 +24,9 @@
 
 #ifdef BOOST_ITERATOR_REF_CONSTNESS_KILLS_WRITABILITY
 # include <boost/type_traits/remove_reference.hpp>
-
-# if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
-#   include <boost/type_traits/add_reference.hpp>
-# endif
-
-#else
+#else 
 # include <boost/type_traits/add_reference.hpp>
-#endif
+#endif 
 
 #include <boost/iterator/detail/config_def.hpp>
 

include/boost/iterator/iterator_facade.hpp

@@ -105,7 +105,6 @@ namespace boost
         
         typedef typename remove_const<ValueParam>::type value_type;
         
-        // Not the real associated pointer type
         typedef typename mpl::eval_if<
             boost::detail::iterator_writability_disabled<ValueParam,Reference>
           , add_pointer<const value_type>
@@ -471,7 +470,8 @@ namespace boost
   //
   class iterator_core_access
   {
-# if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  
+# if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  \
+    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
       // Tasteless as this may seem, making all members public allows member templates
       // to work in the absence of member template friends.
    public:
@@ -618,12 +618,6 @@ namespace boost
          Value, CategoryOrTraversal, Reference, Difference
       > associated_types;
 
-      typedef boost::detail::operator_arrow_result<
-        typename associated_types::value_type
-        , Reference
-        , typename associated_types::pointer
-      > pointer_;
-
    protected:
       // For use by derived classes
       typedef iterator_facade<Derived,Value,CategoryOrTraversal,Reference,Difference> iterator_facade_;
@@ -633,9 +627,7 @@ namespace boost
       typedef typename associated_types::value_type value_type;
       typedef Reference reference;
       typedef Difference difference_type;
-
-      typedef typename pointer_::type pointer;
-
+      typedef typename associated_types::pointer pointer;
       typedef typename associated_types::iterator_category iterator_category;
 
       reference operator*() const
@@ -643,9 +635,18 @@ namespace boost
           return iterator_core_access::dereference(this->derived());
       }
 
-      pointer operator->() const
+      typename boost::detail::operator_arrow_result<
+          value_type
+        , reference
+        , pointer
+      >::type
+      operator->() const
       {
-          return pointer_::make(*this->derived());
+          return boost::detail::operator_arrow_result<
+              value_type
+            , reference
+            , pointer
+          >::make(*this->derived());
       }
         
       typename boost::detail::operator_brackets_result<Derived,Value,reference>::type

include/boost/iterator/zip_iterator.hpp

@@ -357,7 +357,7 @@ namespace boost {
     {
       typedef typename tuple_impl_specific::tuple_meta_transform<
           IteratorTuple
-        , pure_traversal_tag<iterator_traversal<> >
+        , iterator_traversal<>
       >::type tuple_of_traversal_tags;
           
       typedef typename tuple_impl_specific::tuple_meta_accumulate<

test/iterator_facade.cpp

@@ -87,10 +87,6 @@ struct input_iter
     }
 };
 
-template <class T, class U>
-void same_type(U const&)
-{ BOOST_MPL_ASSERT((boost::is_same<T,U>)); }
-
 int main()
 {
     int state = 0;
@@ -105,8 +101,6 @@ int main()
     input_iter p;
     (*p).mutator();
     p->mutator();
-
-    same_type<input_iter::pointer>(p.operator->());
     
     return boost::report_errors();
 }

test/zip_iterator_test.cpp

@@ -46,7 +46,6 @@
 #include <vector>
 #include <list>
 #include <set>
-#include <string>
 #include <functional>
 #include <boost/tuple/tuple.hpp>
 #include <boost/iterator/transform_iterator.hpp>
@@ -61,27 +60,6 @@ struct pure_traversal
         typename boost::iterator_traversal<It>::type
     >
 {};
-
-
-/// Tests for https://svn.boost.org/trac/boost/ticket/1517
-int to_value(int const &v)
-{
-    return v;
-}
-
-void category_test()
-{
-    std::list<int> rng1;
-    std::string rng2;
-
-    boost::make_zip_iterator(
-        boost::make_tuple(
-            boost::make_transform_iterator(rng1.begin(), &to_value), // BidirectionalInput
-            rng2.begin() // RandomAccess
-        )
-    );
-}
-///
   
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -92,8 +70,6 @@ void category_test()
 int main( void )
 {
 
-  category_test();
-
   std::cout << "\n"
             << "***********************************************\n"
             << "*                                             *\n"