Release 1.46.1

[SVN r69890]
Revert [68076], refs #1427 .
2025-07-03 15:56:46 +02:00 · 2011-03-12 15:41:16 +00:00 · 2011-01-28 08:40:25 +00:00 · 2011-01-13 01:25:09 +00:00 · 2011-01-08 18:38:08 +00:00 · 2010-06-26 12:30:09 +00:00
81 changed files with 16 additions and 14 deletions
--- a/doc/BidirectionalTraversal.rst
+++ b/doc/BidirectionalTraversal.rst
--- a/doc/ForwardTraversal.rst
+++ b/doc/ForwardTraversal.rst
--- a/doc/GNUmakefile
+++ b/doc/GNUmakefile
--- a/doc/IncrementableIterator.rst
+++ b/doc/IncrementableIterator.rst
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@ -13,8 +13,11 @@ boostbook standalone
  : 
    iterator 
  :
+    <xsl:param>boost.root=../../../..
    <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
  ;

+
--- a/doc/LvalueIterator.rst
+++ b/doc/LvalueIterator.rst
--- a/doc/ReadableIterator.rst
+++ b/doc/ReadableIterator.rst
--- a/doc/SinglePassIterator.rst
+++ b/doc/SinglePassIterator.rst
--- a/doc/SwappableIterator.rst
+++ b/doc/SwappableIterator.rst
--- a/doc/WritableIterator.rst
+++ b/doc/WritableIterator.rst
--- a/doc/counting_iterator.pdf
+++ b/doc/counting_iterator.pdf
--- a/doc/docutils.sty
+++ b/doc/docutils.sty
--- a/doc/facade-and-adaptor.html
+++ b/doc/facade-and-adaptor.html
--- a/doc/facade-and-adaptor.pdf
+++ b/doc/facade-and-adaptor.pdf
--- a/doc/facade_iterator_category.rst
+++ b/doc/facade_iterator_category.rst
--- a/doc/filter_iterator.pdf
+++ b/doc/filter_iterator.pdf
--- a/doc/function_output_iterator.pdf
+++ b/doc/function_output_iterator.pdf
--- a/doc/index.html
+++ b/doc/index.html
--- a/doc/index.rst
+++ b/doc/index.rst
--- a/doc/indirect_iterator.pdf
+++ b/doc/indirect_iterator.pdf
--- a/doc/indirect_reference_ref.rst
+++ b/doc/indirect_reference_ref.rst
--- a/doc/interoperability-revisited.rst
+++ b/doc/interoperability-revisited.rst
--- a/doc/issues.rst
+++ b/doc/issues.rst
--- a/doc/iterator_adaptor.pdf
+++ b/doc/iterator_adaptor.pdf
--- a/doc/iterator_adaptor_tutorial.rst
+++ b/doc/iterator_adaptor_tutorial.rst
--- a/doc/iterator_archetypes.html
+++ b/doc/iterator_archetypes.html
--- a/doc/iterator_archetypes.pdf
+++ b/doc/iterator_archetypes.pdf
--- a/doc/iterator_archetypes.rst
+++ b/doc/iterator_archetypes.rst
--- a/doc/iterator_concepts.pdf
+++ b/doc/iterator_concepts.pdf
--- a/doc/iterator_concepts.rst
+++ b/doc/iterator_concepts.rst
--- a/doc/iterator_facade.pdf
+++ b/doc/iterator_facade.pdf
--- a/doc/iterator_facade_tutorial.rst
+++ b/doc/iterator_facade_tutorial.rst
--- a/doc/iterator_traits.html
+++ b/doc/iterator_traits.html
--- a/doc/iterator_traits.pdf
+++ b/doc/iterator_traits.pdf
--- a/doc/iterator_traits.rst
+++ b/doc/iterator_traits.rst
--- a/doc/make_counting_iterator.rst
+++ b/doc/make_counting_iterator.rst
--- a/doc/make_filter_iterator.rst
+++ b/doc/make_filter_iterator.rst
--- a/doc/make_transform_iterator.rst
+++ b/doc/make_transform_iterator.rst
--- a/doc/make_zip_iterator.rst
+++ b/doc/make_zip_iterator.rst
--- a/doc/new-iter-concepts.html
+++ b/doc/new-iter-concepts.html
--- a/doc/new-iter-concepts.pdf
+++ b/doc/new-iter-concepts.pdf
--- a/doc/permutation_iterator.pdf
+++ b/doc/permutation_iterator.pdf
--- a/doc/pointee.html
+++ b/doc/pointee.html
--- a/doc/pointee.pdf
+++ b/doc/pointee.pdf
--- a/doc/pointee.rst
+++ b/doc/pointee.rst
--- a/doc/pointee_ref.rst
+++ b/doc/pointee_ref.rst
--- a/doc/reverse_iterator.pdf
+++ b/doc/reverse_iterator.pdf
--- a/doc/transform_iterator.pdf
+++ b/doc/transform_iterator.pdf
--- a/doc/transform_iterator_eg.rst
+++ b/doc/transform_iterator_eg.rst
--- a/doc/zip_iterator.html
+++ b/doc/zip_iterator.html
--- a/doc/zip_iterator.pdf
+++ b/doc/zip_iterator.pdf
--- a/doc/zip_iterator.rst
+++ b/doc/zip_iterator.rst
--- a/doc/zip_iterator_abstract.rst
+++ b/doc/zip_iterator_abstract.rst
--- a/doc/zip_iterator_eg.rst
+++ b/doc/zip_iterator_eg.rst
--- a/doc/zip_iterator_ref.rst
+++ b/doc/zip_iterator_ref.rst
--- a/example/node.hpp
+++ b/example/node.hpp
--- a/example/node_iterator1.cpp
+++ b/example/node_iterator1.cpp
--- a/example/node_iterator1.hpp
+++ b/example/node_iterator1.hpp
--- a/example/node_iterator2.cpp
+++ b/example/node_iterator2.cpp
--- a/example/node_iterator2.hpp
+++ b/example/node_iterator2.hpp
--- a/example/node_iterator3.cpp
+++ b/example/node_iterator3.cpp
--- a/example/node_iterator3.hpp
+++ b/example/node_iterator3.hpp
--- a/include/boost/iterator/detail/any_conversion_eater.hpp
+++ b/include/boost/iterator/detail/any_conversion_eater.hpp
--- a/include/boost/iterator/detail/facade_iterator_category.hpp
+++ b/include/boost/iterator/detail/facade_iterator_category.hpp
--- a/include/boost/iterator/detail/minimum_category.hpp
+++ b/include/boost/iterator/detail/minimum_category.hpp
--- a/include/boost/iterator/is_lvalue_iterator.hpp
+++ b/include/boost/iterator/is_lvalue_iterator.hpp
--- a/include/boost/iterator/is_readable_iterator.hpp
+++ b/include/boost/iterator/is_readable_iterator.hpp
--- a/include/boost/iterator/iterator_facade.hpp
+++ b/include/boost/iterator/iterator_facade.hpp
@ -105,6 +105,7 @@ 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>
@ -323,7 +324,7 @@ namespace boost

        static type make(Reference x)
        {
-            return implicit_cast<type>(&x);
+            return boost::implicit_cast<type>(&x);
        }
    };

@ -617,6 +618,12 @@ 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_;
@ -626,7 +633,9 @@ namespace boost
      typedef typename associated_types::value_type value_type;
      typedef Reference reference;
      typedef Difference difference_type;
-      typedef typename associated_types::pointer pointer;
+
+      typedef typename pointer_::type pointer;
+
      typedef typename associated_types::iterator_category iterator_category;

      reference operator*() const
@ -634,18 +643,9 @@ namespace boost
          return iterator_core_access::dereference(this->derived());
      }

-      typename boost::detail::operator_arrow_result<
-          value_type
-        , reference
-        , pointer
-      >::type
-      operator->() const
+      pointer operator->() const
      {
-          return boost::detail::operator_arrow_result<
-              value_type
-            , reference
-            , pointer
-          >::make(*this->derived());
+          return pointer_::make(*this->derived());
      }
        
      typename boost::detail::operator_brackets_result<Derived,Value,reference>::type
--- a/include/boost/iterator/transform_iterator.hpp
+++ b/include/boost/iterator/transform_iterator.hpp
@ -7,7 +7,6 @@
 #ifndef BOOST_TRANSFORM_ITERATOR_23022003THW_HPP
 #define BOOST_TRANSFORM_ITERATOR_23022003THW_HPP

-#include <boost/function.hpp>
 #include <boost/iterator.hpp>
 #include <boost/iterator/detail/enable_if.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
--- a/include/boost/iterator/zip_iterator.hpp
+++ b/include/boost/iterator/zip_iterator.hpp
--- a/include/boost/pointee.hpp
+++ b/include/boost/pointee.hpp
--- a/index.html
+++ b/index.html
--- a/test/constant_iter_arrow.cpp
+++ b/test/constant_iter_arrow.cpp
--- a/test/constant_iter_arrow_fail.cpp
+++ b/test/constant_iter_arrow_fail.cpp
--- a/test/interoperable.cpp
+++ b/test/interoperable.cpp
--- a/test/is_lvalue_iterator.cpp
+++ b/test/is_lvalue_iterator.cpp
--- a/test/is_readable_iterator.cpp
+++ b/test/is_readable_iterator.cpp
--- a/test/iter_archetype_default_ctor.cpp
+++ b/test/iter_archetype_default_ctor.cpp
--- a/test/iterator_facade.cpp
+++ b/test/iterator_facade.cpp
--- a/test/pointee.cpp
+++ b/test/pointee.cpp
--- a/test/zip_iterator_test.cpp
+++ b/test/zip_iterator_test.cpp
Author	SHA1	Message	Date
Beman Dawes	3f67f56b0c	Release 1.46.1 [SVN r69890]	2011-03-12 15:41:16 +00:00
Daniel James	d45b57c33c	Revert [68076], refs #1427 . Will try to fix this properly in 1.47. [SVN r68524]	2011-01-28 08:40:25 +00:00
Marshall Clow	5a88e6f958	Merging fixes to release; Fixes #1427 [SVN r68076]	2011-01-13 01:25:09 +00:00
Marshall Clow	36565eae63	Merging fixes to release; fixes #2294 fixes #4918 fixes #3645 refs #2823 refs #1427 refs #2893 [SVN r67792]	2011-01-08 18:38:08 +00:00
Daniel James	de4ef14f9b	Merge documentation fixes. * Use `doc/src/.css` instead of `doc/html/.css`. * Remove wiki and people directories. * Some documentation fixes. * Left out `minimal.css` changes and boostbook changes because of clashes. [SVN r63347]	2010-06-26 12:30:09 +00:00
Jeremiah Willcock	f65f03afcc	Merged r62593 from trunk [SVN r62594]	2010-06-08 19:11:44 +00:00
Troy D. Straszheim	cfc04ce11e	rm cmake from the release branch before it goes out broken. Policy dictates that you never commit to release, you commit to trunk and merge to release. [SVN r56941]	2009-10-17 01:10:45 +00:00
Troy D. Straszheim	25d4d34ebe	Add basic copyright/license to keep cmake out of the inspection report [SVN r55095]	2009-07-22 21:51:01 +00:00
John Maddock	ea26e9f109	Merge PDF build changes from Trunk. [SVN r51417]	2009-02-23 18:39:32 +00:00
Troy D. Straszheim	264c186eac	merge of cmake build files from trunk per beman [SVN r50756]	2009-01-24 18:57:20 +00:00