This commit was manufactured by cvs2svn to create tag

'Version_1_31_0'.

[SVN r22162]

doc/facade-and-adaptor.html

@@ -474,12 +474,11 @@ the underlying iterator object of a <tt class="literal"><span class="pre">revers
 </table>
 <p>The user of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> creates a class derived from an
 instantiation of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> and then selectively
-redefines some of the core member functions described in the
-<tt class="literal"><span class="pre">iterator_facade</span></tt> core requirements table. The <tt class="literal"><span class="pre">Base</span></tt> type need
-not meet the full requirements for an iterator; it need only
-support the operations used by the core interface functions of
-<tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been redefined in the user's
-derived class.</p>
+redefines some of the core member functions described in the table
+above. The <tt class="literal"><span class="pre">Base</span></tt> type need not meet the full requirements for an
+iterator. It need only support the operations used by the core
+interface functions of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been
+redefined in the user's derived class.</p>
 <p>Several of the template parameters of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> default
 to <tt class="literal"><span class="pre">use_default</span></tt>. This allows the
 user to make use of a default parameter even when she wants to

doc/generate.py

@@ -1,7 +1,4 @@
 #!/usr/bin/python
-# Copyright David Abrahams 2004. Use, modification and distribution is
-# subject to the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #
 # Generate html, TeX, and PDF versions of all the source files
@@ -16,7 +13,7 @@ if 0:
     for s in sources:
         syscmd('boosthtml %s' % s)
 else:        
-    extensions = ('html', 'pdf')
+    extensions = ('html', 'tex', 'pdf')
 
     if len(sys.argv) > 1:
         extensions = sys.argv[1:]
@@ -26,7 +23,7 @@ else:
           for s in sources 
         ]
 
-    print 'make %s' % ' '.join(all)
-    syscmd('make %s' % ' '.join(all))
+    print 'make -k %s' % ' '.join(all)
+    syscmd('make -k %s' % ' '.join(all))
 
 

doc/index.html

@@ -152,10 +152,9 @@ in <tt class="literal"><span class="pre">indirect_iterator</span></tt>.</li>
 <li><a class="reference" href="iterator_traits.html"><tt class="literal"><span class="pre">iterator_traits.hpp</span></tt></a> (<a class="reference" href="iterator_traits.pdf">PDF</a>): Provides <a class="reference" href="../../mpl/doc/index.html">MPL</a>-compatible metafunctions which
 retrieve an iterator's traits.  Also corrects for the deficiencies
 of broken implementations of <tt class="literal"><span class="pre">std::iterator_traits</span></tt>.</li>
+<li><a class="reference" href="interoperable.html"><tt class="literal"><span class="pre">interoperable.hpp</span></tt></a> (<a class="reference" href="interoperable.pdf">PDF</a>): Provides an <a class="reference" href="../../mpl/doc/index.html">MPL</a>-compatible metafunction for
+testing iterator interoperability</li>
 </ul>
-<!-- * |interoperable|_ (PDF__): Provides an MPL_\ -compatible metafunction for
-testing iterator interoperability -->
-<!-- comment! __ interoperable.pdf -->
 </div>
 <div class="section" id="testing-and-concept-checking">
 <h2><a class="toc-backref" href="#id27" name="testing-and-concept-checking">Testing and Concept Checking</a></h2>

doc/index.rst

@@ -212,8 +212,8 @@ Traits
   retrieve an iterator's traits.  Also corrects for the deficiencies
   of broken implementations of ``std::iterator_traits``.
 
-.. * |interoperable|_ (PDF__): Provides an MPL_\ -compatible metafunction for
-     testing iterator interoperability
+* |interoperable|_ (PDF__): Provides an MPL_\ -compatible metafunction for
+  testing iterator interoperability
 
 .. |pointee| replace:: ``pointee.hpp``
 .. _pointee: pointee.html
@@ -225,7 +225,7 @@ __ iterator_traits.pdf
 
 .. |interoperable| replace:: ``interoperable.hpp``
 .. _interoperable: interoperable.html
-.. comment! __ interoperable.pdf
+__ interoperable.pdf
 
 .. _MPL: ../../mpl/doc/index.html
 

doc/iterator_adaptor.html

@@ -92,12 +92,11 @@ the underlying iterator object of a <tt class="literal"><span class="pre">revers
 </table>
 <p>The user of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> creates a class derived from an
 instantiation of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> and then selectively
-redefines some of the core member functions described in the
-<tt class="literal"><span class="pre">iterator_facade</span></tt> core requirements table. The <tt class="literal"><span class="pre">Base</span></tt> type need
-not meet the full requirements for an iterator; it need only
-support the operations used by the core interface functions of
-<tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been redefined in the user's
-derived class.</p>
+redefines some of the core member functions described in the table
+above. The <tt class="literal"><span class="pre">Base</span></tt> type need not meet the full requirements for an
+iterator. It need only support the operations used by the core
+interface functions of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been
+redefined in the user's derived class.</p>
 <p>Several of the template parameters of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> default
 to <tt class="literal"><span class="pre">use_default</span></tt>. This allows the
 user to make use of a default parameter even when she wants to

doc/iterator_adaptor_body.rst

@@ -18,12 +18,11 @@ instance of the ``Base`` type, which it stores as a member.
 
 The user of ``iterator_adaptor`` creates a class derived from an
 instantiation of ``iterator_adaptor`` and then selectively
-redefines some of the core member functions described in the
-``iterator_facade`` core requirements table. The ``Base`` type need
-not meet the full requirements for an iterator; it need only
-support the operations used by the core interface functions of
-``iterator_adaptor`` that have not been redefined in the user's
-derived class.
+redefines some of the core member functions described in the table
+above. The ``Base`` type need not meet the full requirements for an
+iterator. It need only support the operations used by the core
+interface functions of ``iterator_adaptor`` that have not been
+redefined in the user's derived class.
 
 Several of the template parameters of ``iterator_adaptor`` default
 to ``use_default``. This allows the

doc/iterator_archetypes.html

@@ -7,7 +7,7 @@
 <title>Iterator Archetype</title>
 <meta name="author" content="David Abrahams, Jeremy Siek, Thomas Witt" />
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab, Zephyr Associates, Inc." />
-<meta name="date" content="2004-01-27" />
+<meta name="date" content="2004-01-16" />
 <meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004. All rights reserved" />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
@@ -26,7 +26,7 @@
 <td><a class="first reference" href="http://www.boost-consulting.com">Boost Consulting</a>, Indiana University <a class="reference" href="http://www.osl.iu.edu">Open Systems
 Lab</a>, <a class="last reference" href="http://www.styleadvisor.com">Zephyr Associates, Inc.</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-27</td></tr>
+<td>2004-01-16</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
 <td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004. All rights reserved</td></tr>
 </tbody>
@@ -35,11 +35,7 @@ Lab</a>, <a class="last reference" href="http://www.styleadvisor.com">Zephyr Ass
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">abstract:</th><td class="field-body">The <tt class="literal"><span class="pre">iterator_archetype</span></tt> class constructs a minimal implementation of
-one of the iterator access concepts and one of the iterator traversal concepts.
-This is used for doing a compile-time check to see if a the type requirements
-of a template are really enough to cover the implementation of the template.
-For further information see the documentation for the <a class="reference" href="../../concept_check/index.html"><tt class="literal"><span class="pre">boost::concept_check</span></tt></a> library.</td>
+<tr class="field"><th class="field-name">abstract:</th><td class="field-body">iterator archetypes provide a means to check the compile time requirements of a generic component on its iterator arguments.</td>
 </tr>
 </tbody>
 </table>

doc/iterator_archetypes.rst

@@ -13,15 +13,7 @@
 .. _`Open Systems Lab`: http://www.osl.iu.edu
 .. _`Zephyr Associates, Inc.`: http://www.styleadvisor.com
 
-:abstract: The ``iterator_archetype`` class constructs a minimal implementation of
-  one of the iterator access concepts and one of the iterator traversal concepts.
-  This is used for doing a compile-time check to see if a the type requirements
-  of a template are really enough to cover the implementation of the template.
-  For further information see the documentation for the |concepts|_ library.
-
-.. |concepts| replace:: ``boost::concept_check``
-.. _concepts: ../../concept_check/index.html
-
+:abstract: iterator archetypes provide a means to check the compile time requirements of a generic component on its iterator arguments.
 
 .. contents:: Table of Contents
 
@@ -186,4 +178,4 @@ The nested trait types are defined as follows:
 
         2. X is convertible to TraversalCategory
 
-        
+        

doc/iterator_facade.html

@@ -1287,10 +1287,6 @@ appropriate:</p>
 
   ...
 
-private: 
-  struct enabler {};
-
-public:
   template &lt;class OtherValue&gt;
   node_iter(
       node_iter&lt;OtherValue&gt; const&amp; other

doc/iterator_facade_tutorial.rst

@@ -483,10 +483,6 @@ appropriate::
 
     ...
 
-  private: 
-    struct enabler {};
-
-  public:
     template <class OtherValue>
     node_iter(
         node_iter<OtherValue> const& other

doc/new-iter-concepts.html

@@ -7,7 +7,7 @@
 <title>New Iterator Concepts</title>
 <meta name="author" content="David Abrahams, Jeremy Siek, Thomas Witt" />
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab, Zephyr Associates, Inc." />
-<meta name="date" content="2004-04-06" />
+<meta name="date" content="2004-01-19" />
 <meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
@@ -26,7 +26,7 @@
 <td><a class="first reference" href="http://www.boost-consulting.com">Boost Consulting</a>, Indiana University <a class="reference" href="http://www.osl.iu.edu">Open Systems
 Lab</a>, <a class="last reference" href="http://www.styleadvisor.com">Zephyr Associates, Inc.</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-04-06</td></tr>
+<td>2004-01-19</td></tr>
 <tr class="field"><th class="docinfo-name">Number:</th><td class="field-body">This is a revised version of <a class="reference" href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1550.html">n1550</a>=03-0133, which was
 accepted for Technical Report 1 by the C++ standard
 committee's library working group. This proposal is a
@@ -201,9 +201,10 @@ iterator concepts because the new concepts provide a more accurate way
 to express their type requirements. The result is algorithms that are
 usable in more situations and have fewer type requirements.</p>
 <p>For the next working paper (but not for TR1), the committee should
-consider the following changes to the type requirements of algorithms.
-These changes are phrased as textual substitutions, listing the
-algorithms to which each textual substitution applies.</p>
+consider the following changes to the type requirements of
+algorithms.  These changes are phrased as phrased as textual
+substitutions, listing the algorithms to which each textual
+substitution applies.</p>
 <p>Forward Iterator -&gt; Forward Traversal Iterator and Readable Iterator</p>
 <blockquote>
 <tt class="literal"><span class="pre">find_end,</span> <span class="pre">adjacent_find,</span> <span class="pre">search,</span> <span class="pre">search_n,</span> <span class="pre">rotate_copy,</span>
@@ -998,5 +999,10 @@ LocalWords:  incrementable xxx min prev inplace png oldeqnew AccessTag struct
 LocalWords:  TraversalTag typename lvalues DWA Hmm JGS mis enum -->
 </div>
 </div>
+<hr class="footer" />
+<div class="footer">
+<a class="reference" href="new-iter-concepts.rst">View document source</a>.
+Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
+</div>
 </body>
 </html>

doc/new-iter-concepts.rst

@@ -163,9 +163,10 @@ to express their type requirements. The result is algorithms that are
 usable in more situations and have fewer type requirements.
 
 For the next working paper (but not for TR1), the committee should
-consider the following changes to the type requirements of algorithms.
-These changes are phrased as textual substitutions, listing the
-algorithms to which each textual substitution applies.
+consider the following changes to the type requirements of
+algorithms.  These changes are phrased as phrased as textual
+substitutions, listing the algorithms to which each textual
+substitution applies.
 
 Forward Iterator -> Forward Traversal Iterator and Readable Iterator
 

doc/pointee.html

@@ -21,7 +21,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>David Abrahams</td></tr>
 <tr><th class="docinfo-name">Contact:</th>
-<td><a class="first last reference" href="mailto:dave&#64;boost-consulting.com">dave&#64;boost-consulting.com</a></td></tr>
+<td><a class="first reference" href="mailto:dave&#64;boost-consulting.com">dave&#64;boost-consulting.com</a>, <a class="reference" href="mailto:jsiek&#64;osl.iu.edu">jsiek&#64;osl.iu.edu</a>, <a class="last reference" href="mailto:witt&#64;ive.uni-hannover.de">witt&#64;ive.uni-hannover.de</a></td></tr>
 <tr><th class="docinfo-name">Organization:</th>
 <td><a class="first last reference" href="http://www.boost-consulting.com">Boost Consulting</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>

example/Jamfile

@@ -10,11 +10,4 @@ test-suite iterator_examples
     [ run node_iterator1.cpp ]
     [ run node_iterator2.cpp ]
     [ run node_iterator3.cpp ]
-    [ run counting_iterator_example.cpp ]
-    [ run filter_iterator_example.cpp ]
-    [ run function_output_iterator_example.cpp ]
-    [ run indirect_iterator_example.cpp ]
-    [ run permutation_iterator_example.cpp ]
-    [ run reverse_iterator_example.cpp ]
-    [ run transform_iterator_example.cpp ]
       ;

include/boost/function_output_iterator.hpp

@@ -26,9 +26,7 @@ namespace boost {
     typedef void                pointer;
     typedef void                reference;
 
-    explicit function_output_iterator() {}
-
-    explicit function_output_iterator(const UnaryFunction& f)
+    explicit function_output_iterator(const UnaryFunction& f = UnaryFunction())
       : m_f(f) {}
 
     struct output_proxy {

include/boost/iterator/detail/facade_iterator_category.hpp

@@ -107,8 +107,13 @@ struct iterator_facade_default_category
                 // check for readability
               , is_convertible<Reference, ValueParam>
             >
-          , mpl::identity<std::input_iterator_tag>
-          , mpl::identity<Traversal>
+          , mpl::if_<
+                iterator_writability_disabled<ValueParam,Reference>
+              , std::input_iterator_tag
+              , input_output_iterator_tag
+            >
+            
+          , mpl::identity<std::output_iterator_tag>
         >
     >
 {

include/boost/iterator/iterator_categories.hpp

@@ -27,11 +27,7 @@ namespace boost {
 //
 // Traversal Categories
 //
-
-struct no_traversal_tag {};
-
-struct incrementable_traversal_tag 
-  : no_traversal_tag {};
+struct incrementable_traversal_tag {};
   
 struct single_pass_traversal_tag
   : incrementable_traversal_tag {};

test/Jamfile

@@ -6,6 +6,8 @@
 
 subproject libs/iterator/test ;
 
+subinclude libs/iterator/example ;
+
 import testing ;
 
 test-suite iterator
@@ -33,11 +35,10 @@ test-suite iterator
       
     [ run unit_tests.cpp ]
     [ run concept_tests.cpp ]
+    [ compile-fail lvalue_concept_fail_expected.cpp ]
     [ run iterator_adaptor_cc.cpp ]
     [ run iterator_adaptor_test.cpp ]
     [ compile iterator_archetype_cc.cpp ]
-    [ compile-fail iterator_archetype_default_ctor.cpp ]
-    [ compile-fail lvalue_concept_fail_expected.cpp ]
     [ run transform_iterator_test.cpp ]
     [ run indirect_iterator_test.cpp ]
     [ compile indirect_iterator_member_types.cpp ]
@@ -57,5 +58,5 @@ test-suite iterator
     [ run ../../utility/reverse_iterator_example.cpp ]
     [ run ../../utility/transform_iterator_example.cpp ]
     [ run ../../utility/iterator_traits_test.cpp ]
-    [ run ../../utility/shared_iterator_test.cpp ]
+      
 ;

test/iterator_archetype_default_ctor.cpp

@@ -1,22 +0,0 @@
-//
-// Copyright Thomas Witt 2004. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-//
-#include <boost/iterator/iterator_archetypes.hpp>
-
-
-int main()
-{
-  typedef boost::iterator_archetype<
-      int
-    , boost::iterator_archetypes::readable_iterator_t
-    , boost::single_pass_traversal_tag
-    > iter;
-
-  // single_pass_traversal iterators are not required to be
-  // default constructible
-  iter it;
-}

test/zip_iterator_test.cpp

@@ -82,6 +82,86 @@ int main( void )
   size_t num_successful_tests = 0;
   size_t num_failed_tests = 0;
   
+  /////////////////////////////////////////////////////////////////////////////
+  //
+  // Make sure tuples are supported
+  //
+  /////////////////////////////////////////////////////////////////////////////
+  
+  std::cout << "Basic tuple support:                         "
+            << std::flush;
+
+  typedef boost::tuples::tuple<int, double> mytuple;
+  mytuple t1;
+  boost::tuples::get<0>(t1) = 42;
+  boost::tuples::get<1>(t1) = 42.1;
+
+  if( 2 == boost::tuples::length<mytuple>::value &&
+      42 == boost::tuples::get<0>(t1) &&
+      42.1 == boost::tuples::get<1>(t1) 
+    )
+  {
+    ++num_successful_tests;
+    std::cout << "OK" << std::endl;
+  }
+  else
+  {
+    ++num_failed_tests = 0;
+    std::cout << "not OK" << std::endl;
+  }
+
+  /////////////////////////////////////////////////////////////////////////////
+  //
+  // Make sure iterator adaptor is supported
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  std::cout << "Basic iterator adaptor support:              "
+            << std::flush;
+
+  std::set<int> s;
+  s.insert(42);
+  s.insert(43);
+  s.insert(44);
+
+  typedef boost::transform_iterator<
+    std::binder1st<std::plus<int> >,
+    std::set<int>::iterator
+    > 
+    add_seven_iterator;
+
+  typedef boost::transform_iterator<
+    std::binder1st<std::plus<int> >,
+    std::set<int>::const_iterator
+    > 
+    const_add_seven_iterator;
+
+  add_seven_iterator set_run(s.begin(), std::bind1st(std::plus<int>(), 7));
+  add_seven_iterator set_end(s.end(), std::bind1st(std::plus<int>(), 7));
+
+  const_add_seven_iterator const_set_run(s.begin(), std::bind1st(std::plus<int>(), 7));
+//  set_run = const_set_run; // Error: can't convert from const to non-const
+  const_set_run = set_run;
+
+  if( 49 == *set_run &&
+      50 == *++set_run &&
+      51 == *++set_run &&
+      set_end == ++set_run &&
+      49 == *const_set_run &&
+      50 == *++const_set_run &&
+      51 == *++const_set_run &&
+      set_end == ++const_set_run
+    )
+  {
+    ++num_successful_tests;
+    std::cout << "OK" << std::endl;
+  }
+  else
+  {
+    ++num_failed_tests = 0;
+    std::cout << "not OK" << std::endl;
+  }
+
   /////////////////////////////////////////////////////////////////////////////
   //
   // Zip iterator construction and dereferencing