Branch for merging Boost.Build and Boost.Jam completely.

[SVN r59143]
category of each component iterator is reduced to a known category before we try to find a minimum.
2026-01-20 16:42:16 +00:00 · 2010-01-19 20:47:20 +00:00 · 2009-11-28 18:53:43 +00:00 · 2009-11-28 05:12:29 +00:00 · 2009-10-17 02:07:38 +00:00 · 2009-07-26 00:49:56 +00:00
6 changed files with 33 additions and 3 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -13,7 +13,6 @@ 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
--- a/include/boost/iterator/iterator_facade.hpp
+++ b/include/boost/iterator/iterator_facade.hpp
@@ -324,7 +324,7 @@ namespace boost

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

--- a/include/boost/iterator/transform_iterator.hpp
+++ b/include/boost/iterator/transform_iterator.hpp
@@ -7,6 +7,7 @@
 #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
@@ -357,7 +357,7 @@ namespace boost {
    {
      typedef typename tuple_impl_specific::tuple_meta_transform<
          IteratorTuple
-        , iterator_traversal<>
+        , pure_traversal_tag<iterator_traversal<> >
      >::type tuple_of_traversal_tags;
          
      typedef typename tuple_impl_specific::tuple_meta_accumulate<
--- a/test/iterator_facade.cpp
+++ b/test/iterator_facade.cpp
@@ -87,6 +87,10 @@ 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;
@@ -101,6 +105,8 @@ int main()
    input_iter p;
    (*p).mutator();
    p->mutator();
+
+    same_type<input_iter::pointer>(p.operator->());
    
    return boost::report_errors();
 }
--- a/test/zip_iterator_test.cpp
+++ b/test/zip_iterator_test.cpp
@@ -46,6 +46,7 @@
 #include <vector>
 #include <list>
 #include <set>
+#include <string>
 #include <functional>
 #include <boost/tuple/tuple.hpp>
 #include <boost/iterator/transform_iterator.hpp>
@@ -60,6 +61,27 @@ 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
+        )
+    );
+}
+///
  
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -70,6 +92,8 @@ struct pure_traversal
 int main( void )
 {

+  category_test();
+
  std::cout << "\n"
            << "***********************************************\n"
            << "*                                             *\n"
Author	SHA1	Message	Date
Vladimir Prus	cc5b3f5ad0	Branch for merging Boost.Build and Boost.Jam completely. [SVN r59143]	2010-01-19 20:47:20 +00:00
Dave Abrahams	ac522bc9e1	category of each component iterator is reduced to a known category before we try to find a minimum. Closes #1517 [SVN r58012]	2009-11-28 18:53:43 +00:00
Dave Abrahams	4c60e26bf8	Made sure that iterator_facade's nested ``::pointer`` type is always the same as what's returned from operator->. For input iterators, that wasn't always the case (see operator_arrow_proxy). Fixes #1019. [SVN r57989]	2009-11-28 05:12:29 +00:00
Troy D. Straszheim	d11c7a3ec4	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Troy D. Straszheim	76fd8e27fb	Copyrights on CMakeLists.txt to keep them from clogging up the inspect reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]	2009-07-26 00:49:56 +00:00
John Maddock	f2433c63d5	Add PDF generation options to fix external links to point to the web site. Added a few more Boostbook based libs that were missed first time around. Fixed PDF naming issues. [SVN r51284]	2009-02-17 10:05:58 +00:00
Michael A. Jackson	55c08b706c	Updating dependency information for modularized libraries. [SVN r49628]	2008-11-07 17:05:27 +00:00
Michael A. Jackson	835498603d	Updating CMake files to latest trunk. Added dependency information for regression tests and a few new macros for internal use. [SVN r49627]	2008-11-07 17:02:56 +00:00
Michael A. Jackson	b0ec5a759b	Continuing merge of CMake build system files into trunk with the encouragement of Doug Gregor [SVN r49510]	2008-11-01 13:15:41 +00:00
Nicola Musatti	e06c4b3279	Applied patch from ticket #2344 [SVN r49227]	2008-10-09 21:49:48 +00:00
Daniel James	bf7d904bf8	Point links to the pages that used to be in 'more' to the site. [SVN r43210]	2008-02-10 15:02:17 +00:00
Boris Gubenko	efecbd0d27	don't use identifires R1 and R2: some HP-UX headers define them as macros [SVN r42064]	2007-12-15 03:42:49 +00:00
Dave Abrahams	65e229fb0d	SunPro 5.9 can't detect lvalue returns [SVN r41956]	2007-12-10 15:19:21 +00:00