This commit was manufactured by cvs2svn to create tag

'Version_1_31_0'. [SVN r22162]
Added missing include <cstddef>
2004-02-04 15:24:32 +00:00 · 2004-01-27 11:24:25 +00:00 · 2004-01-26 11:29:07 +00:00 · 2004-01-26 00:30:09 +00:00 · 2004-01-14 20:43:53 +00:00 · 2004-01-07 14:08:10 +00:00
94 changed files with 6273 additions and 6484 deletions
--- a/Collection.html
+++ b/Collection.html
@ -0,0 +1,648 @@
+<HTML>
+<!--
+  -- Copyright (c) Jeremy Siek 2000
+  --
+  -- Permission to use, copy, modify, distribute and sell this software
+  -- and its documentation for any purpose is hereby granted without fee,
+  -- provided that the above copyright notice appears in all copies and
+  -- that both that copyright notice and this permission notice appear
+  -- in supporting documentation.  Silicon Graphics makes no
+  -- representations about the suitability of this software for any
+  -- purpose.  It is provided "as is" without express or implied warranty.
+  -->
+<Head>
+<Title>Collection</Title>
+</HEAD>
+
+<BODY BGCOLOR="#ffffff" LINK="#0000ee" TEXT="#000000" VLINK="#551a8b" 
+	ALINK="#ff0000"> 
+<h1>
+   <img src="../../c++boost.gif" alt="boost logo"
+    width="277" align="middle" height="86">
+   <br>Collection
+</h1>
+
+<h3>Description</h3>
+
+A Collection is a <i>concept</i> similar to the STL <a
+href="http://www.sgi.com/tech/stl/Container.html">Container</a>
+concept.  A Collection provides iterators for accessing a range of
+elements and provides information about the number of elements in the
+Collection.  However, a Collection has fewer requirements than a
+Container. The motivation for the Collection concept is that there are
+many useful Container-like types that do not meet the full
+requirements of Container, and many algorithms that can be written
+with this reduced set of requirements. To summarize the reduction
+in requirements:
+
+<UL>
+<LI>It is not required to &quot;own&quot; its elements: the lifetime
+of an element in a Collection does not have to match the lifetime of
+the Collection object, though the lifetime of the element should cover
+the lifetime of the Collection object.
+<LI>The semantics of copying a Collection object is not defined (it
+could be a deep or shallow copy or not even support copying). 
+<LI>The associated reference type of a Collection does
+not have to be a real C++ reference.
+</UL>
+
+
+Because of the reduced requirements, some care must be taken when
+writing code that is meant to be generic for all Collection types.
+In particular, a Collection object should be passed by-reference
+since assumptions can not be made about the behaviour of the
+copy constructor.
+
+<p>
+
+<h3>Associated types</h3>
+
+<Table border>
+<TR>
+<TD VAlign=top>
+Value type
+</TD>
+<TD VAlign=top>
+<tt>X::value_type</tt>
+</TD>
+<TD VAlign=top>
+The type of the object stored in a Collection.  
+If the Collection is <i>mutable</i> then
+the value type must be <A
+href="http://www.sgi.com/tech/stl/Assignable.html">Assignable</A>.
+Otherwise the value type must be <a href="./CopyConstructible.html">CopyConstructible</a>.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Iterator type
+</TD>
+<TD VAlign=top>
+<tt>X::iterator</tt>
+</TD>
+<TD VAlign=top>
+The type of iterator used to iterate through a Collection's
+   elements.  The iterator's value type is expected to be the
+   Collection's value type.  A conversion
+   from the iterator type to the const iterator type must exist.
+   The iterator type must be an <A href="http://www.sgi.com/tech/stl/InputIterator.html">InputIterator</A>.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Const iterator type
+</TD>
+<TD VAlign=top>
+<tt>X::const_iterator</tt>
+</TD>
+<TD VAlign=top>
+A type of iterator that may be used to examine, but not to modify,
+   a Collection's elements.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Reference type
+</TD>
+<TD VAlign=top>
+<tt>X::reference</tt>
+</TD>
+<TD VAlign=top>
+A type that behaves like a reference to the Collection's value type.
+<a href="#1">[1]</a>
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Const reference type
+</TD>
+<TD VAlign=top>
+<tt>X::const_reference</tt>
+</TD>
+<TD VAlign=top>
+A type that behaves like a const reference to the Collection's value type.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Pointer type
+</TD>
+<TD VAlign=top>
+<tt>X::pointer</tt>
+</TD>
+<TD VAlign=top>
+A type that behaves as a pointer to the Collection's value type.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Distance type
+</TD>
+<TD VAlign=top>
+<tt>X::difference_type</tt>
+</TD>
+<TD VAlign=top>
+A signed integral type used to represent the distance between two
+   of the Collection's iterators.  This type must be the same as 
+   the iterator's distance type.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Size type
+</TD>
+<TD VAlign=top>
+<tt>X::size_type</tt>
+</TD>
+<TD VAlign=top>
+An unsigned integral type that can represent any nonnegative value
+   of the Collection's distance type.
+</TD>
+</tr>
+</table>
+<h3>Notation</h3>
+<Table>
+<TR>
+<TD VAlign=top>
+<tt>X</tt>
+</TD>
+<TD VAlign=top>
+A type that is a model of Collection.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+<tt>a</tt>, <tt>b</tt>
+</TD>
+<TD VAlign=top>
+Object of type <tt>X</tt>.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+<tt>T</tt>
+</TD>
+<TD VAlign=top>
+The value type of <tt>X</tt>.
+</TD>
+</tr>
+</table>
+
+<h3>Valid expressions</h3>
+
+The following expressions must be valid.
+<p>
+
+<Table border>
+<TR>
+<TH>
+Name
+</TH>
+<TH>
+Expression
+</TH>
+<TH>
+Return type
+</TH>
+</TR>
+<TR>
+<TD VAlign=top>
+Beginning of range
+</TD>
+<TD VAlign=top>
+<tt>a.begin()</tt>
+</TD>
+<TD VAlign=top>
+<tt>iterator</tt> if <tt>a</tt> is mutable, <tt>const_iterator</tt> otherwise
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+End of range
+</TD>
+<TD VAlign=top>
+<tt>a.end()</tt>
+</TD>
+<TD VAlign=top>
+<tt>iterator</tt> if <tt>a</tt> is mutable, <tt>const_iterator</tt> otherwise
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Size
+</TD>
+<TD VAlign=top>
+<tt>a.size()</tt>
+</TD>
+<TD VAlign=top>
+<tt>size_type</tt>
+</TD>
+</TR>
+<!--
+<TR>
+<TD VAlign=top>
+Maximum size
+</TD>
+<TD VAlign=top>
+<tt>a.max_size()</tt>
+</TD>
+<TD VAlign=top>
+<tt>size_type</tt>
+</TD>
+</TR>
+<TR>
+-->
+<TD VAlign=top>
+Empty Collection
+</TD>
+<TD VAlign=top>
+<tt>a.empty()</tt>
+</TD>
+<TD VAlign=top>
+Convertible to <tt>bool</tt>
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Swap
+</TD>
+<TD VAlign=top>
+<tt>a.swap(b)</tt>
+</TD>
+<TD VAlign=top>
+<tt>void</tt>
+</TD>
+</tr>
+</table>
+<h3>Expression semantics</h3>
+
+<Table border>
+<TR>
+<TH>
+Name
+</TH>
+<TH>
+Expression
+</TH>
+<TH>
+Semantics
+</TH>
+<TH>
+Postcondition
+</TH>
+</TR>
+<TD VAlign=top>
+<TR>
+<TD VAlign=top>
+Beginning of range
+</TD>
+<TD VAlign=top>
+<tt>a.begin()</tt>
+</TD>
+<TD VAlign=top>
+Returns an iterator pointing to the first element in the Collection.
+</TD>
+<TD VAlign=top>
+<tt>a.begin()</tt> is either dereferenceable or past-the-end.  It is
+   past-the-end if and only if <tt>a.size() == 0</tt>.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+End of range
+</TD>
+<TD VAlign=top>
+<tt>a.end()</tt>
+</TD>
+<TD VAlign=top>
+Returns an iterator pointing one past the last element in the
+   Collection.
+</TD>
+<TD VAlign=top>
+<tt>a.end()</tt> is past-the-end.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Size
+</TD>
+<TD VAlign=top>
+<tt>a.size()</tt>
+</TD>
+<TD VAlign=top>
+Returns the size of the Collection, that is, its number of elements.
+</TD>
+<TD VAlign=top>
+<tt>a.size() &gt;= 0 
+</TD>
+</TR>
+<!--
+<TR>
+<TD VAlign=top>
+Maximum size
+</TD>
+<TD VAlign=top>
+<tt>a.max_size()</tt>
+</TD>
+<TD VAlign=top>
+&nbsp;
+</TD>
+<TD VAlign=top>
+Returns the largest size that this Collection can ever have. <A href="#8">[8]</A>
+</TD>
+<TD VAlign=top>
+<tt>a.max_size() &gt;= 0 &amp;&amp; a.max_size() &gt;= a.size()</tt>
+</TD>
+</TR>
+ -->
+<TR>
+<TD VAlign=top>
+Empty Collection
+</TD>
+<TD VAlign=top>
+<tt>a.empty()</tt>
+</TD>
+<TD VAlign=top>
+Equivalent to <tt>a.size() == 0</tt>.  (But possibly faster.)
+</TD>
+<TD VAlign=top>
+&nbsp;
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Swap
+</TD>
+<TD VAlign=top>
+<tt>a.swap(b)</tt>
+</TD>
+<TD VAlign=top>
+Equivalent to <tt>swap(a,b)</tt>
+</TD>
+<TD VAlign=top>
+&nbsp;
+</TD>
+</tr>
+</table>
+<h3>Complexity guarantees</h3>
+
+<tt>begin()</tt> and <tt>end()</tt> are amortized constant time.
+<P>
+<tt>size()</tt> is at most linear in the Collection's
+size. <tt>empty()</tt> is amortized constant time.
+<P>
+<tt>swap()</tt> is at most linear in the size of the two collections.
+<h3>Invariants</h3>
+<Table border>
+<TR>
+<TD VAlign=top>
+Valid range
+</TD>
+<TD VAlign=top>
+For any Collection <tt>a</tt>, <tt>[a.begin(), a.end())</tt> is a valid
+   range.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Range size
+</TD>
+<TD VAlign=top>
+<tt>a.size()</tt> is equal to the distance from <tt>a.begin()</tt> to <tt>a.end()</tt>.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+Completeness
+</TD>
+<TD VAlign=top>
+An algorithm that iterates through the range <tt>[a.begin(), a.end())</tt>
+   will pass through every element of <tt>a</tt>.
+</TD>
+</tr>
+</table>
+
+
+<h3>Models</h3>
+<UL>
+<LI> <tt>array</tt>
+<LI> <tt>array_ptr</tt>
+<LI> <tt>vector&lt;bool&gt;</tt>
+</UL>
+
+
+<h3>Collection Refinements</h3>
+
+There are quite a few concepts that refine the Collection concept,
+similar to the concepts that refine the Container concept. Here
+is a brief overview of the refining concepts.
+
+<h4>ForwardCollection</h4>
+The elements are arranged in some order that
+does not change spontaneously from one iteration to the next. As
+a result, a ForwardCollection is 
+<A
+href="http://www.sgi.com/tech/stl/EqualityComparable.html">EqualityComparable</A>
+and 
+<A
+href="http://www.sgi.com/tech/stl/LessThanComparable.html">LessThanComparable</A>.
+In addition, the iterator type of a ForwardCollection is a
+MultiPassInputIterator which is just an InputIterator with the added
+requirements that the iterator can be used to make multiple passes
+through a range, and that if <tt>it1 == it2</tt> and <tt>it1</tt> is
+dereferenceable then <tt>++it1 == ++it2</tt>. The ForwardCollection
+also has a <tt>front()</tt> method.
+
+<p>
+<Table border>
+<TR>
+<TH>
+Name
+</TH>
+<TH>
+Expression
+</TH>
+<TH>
+Return type
+</TH>
+<TH>
+Semantics
+</TH>
+</TR>
+
+<TR>
+<TD VAlign=top>
+Front
+</TD>
+<TD VAlign=top>
+<tt>a.front()</tt>
+</TD>
+<TD VAlign=top>
+<tt>reference</tt> if <tt>a</tt> is mutable, <br> <tt>const_reference</tt>
+otherwise.
+</TD>
+<TD VAlign=top>
+Equivalent to <tt>*(a.begin())</tt>.
+</TD>
+</TR>
+
+</table>
+
+
+<h4>ReversibleCollection</h4>
+
+The container provides access to iterators that traverse in both
+directions (forward and reverse). The iterator type must meet all of
+the requirements of
+<a href="http://www.sgi.com/tech/stl/BidirectionalIterator.html">BidirectionalIterator</a>
+except that the reference type does not have to be a real C++
+reference. The ReversibleCollection adds the following requirements
+to those of ForwardCollection.
+<p>
+
+<Table border>
+<TR>
+<TH>
+Name
+</TH>
+<TH>
+Expression
+</TH>
+<TH>
+Return type
+</TH>
+<TH>
+Semantics
+</TH>
+</TR>
+<TR>
+<TD VAlign=top>
+Beginning of range
+</TD>
+<TD VAlign=top>
+<tt>a.rbegin()</tt>
+</TD>
+<TD VAlign=top>
+<tt>reverse_iterator</tt> if <tt>a</tt> is mutable,
+<tt>const_reverse_iterator</tt> otherwise.
+</TD>
+<TD VAlign=top>
+Equivalent to <tt>X::reverse_iterator(a.end())</tt>.
+</TD>
+</TR>
+<TR>
+<TD VAlign=top>
+End of range
+</TD>
+<TD VAlign=top>
+<tt>a.rend()</tt>
+</TD>
+<TD VAlign=top>
+<tt>reverse_iterator</tt> if <tt>a</tt> is mutable,
+<tt>const_reverse_iterator</tt> otherwise.
+</TD>
+<TD VAlign=top>
+Equivalent to <tt>X::reverse_iterator(a.begin())</tt>.
+</TD>
+</tr>
+
+<TR>
+<TD VAlign=top>
+Back
+</TD>
+<TD VAlign=top>
+<tt>a.back()</tt>
+</TD>
+<TD VAlign=top>
+<tt>reference</tt> if <tt>a</tt> is mutable, <br> <tt>const_reference</tt>
+otherwise.
+</TD>
+<TD VAlign=top>
+Equivalent to <tt>*(--a.end())</tt>.
+</TD>
+</TR>
+
+</table>
+
+<h4>SequentialCollection</h4>
+
+The elements are arranged in a strict linear order. No extra methods
+are required.
+
+<h4>RandomAccessCollection</h4>
+
+The iterators of a RandomAccessCollection satisfy all of the
+requirements of <a
+href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">RandomAccessIterator</a>
+except that the reference type does not have to be a real C++
+reference. In addition, a RandomAccessCollection provides 
+an element access operator.
+
+<p>
+
+<Table border>
+<TR>
+<TH>
+Name
+</TH>
+<TH>
+Expression
+</TH>
+<TH>
+Return type
+</TH>
+<TH>
+Semantics
+</TH>
+</TR>
+<TR>
+<TD VAlign=top>
+Element Access
+</TD>
+<TD VAlign=top>
+<tt>a[n]</tt>
+</TD>
+<TD VAlign=top>
+<tt>reference</tt> if <tt>a</tt> is mutable,
+<tt>const_reference</tt> otherwise.
+</TD>
+<TD VAlign=top>
+Returns the nth element of the Collection.
+<tt>n</tt> must be convertible to <tt>size_type</tt>.
+Precondition: <tt>0 &lt;= n &lt; a.size()</tt>.
+</TD>
+</TR>
+
+</table>
+
+<h3>Notes</h3>
+
+<P><A name="1">[1]</A> 
+
+The reference type does not have to be a real C++ reference. The
+requirements of the reference type depend on the context within which
+the Collection is being used. Specifically it depends on the
+requirements the context places on the value type of the Collection.
+The reference type of the Collection must meet the same requirements
+as the value type. In addition, the reference objects must be
+equivalent to the value type objects in the collection (which is
+trivially true if they are the same object).  Also, in a mutable
+Collection, an assignment to the reference object must result in an
+assignment to the object in the Collection (again, which is trivially
+true if they are the same object, but non-trivial if the reference
+type is a proxy class).
+
+<h3>See also</h3>
+<A href="http://www.sgi.com/tech/stl/Container.html">Container</A>
+
+
+<br>
+<HR>
+<TABLE>
+<TR valign=top>
+<TD nowrap>Copyright &copy 2000</TD><TD>
+<A HREF=http://www.boost.org/people/jeremy_siek.htm>Jeremy Siek</A>, Univ.of Notre Dame and C++ Library & Compiler Group/SGI (<A HREF="mailto:jsiek@engr.sgi.com">jsiek@engr.sgi.com</A>)
+</TD></TR></TABLE>
+
+</BODY>
+</HTML> 
--- a/OptionalPointee.html
+++ b/OptionalPointee.html
@ -0,0 +1,158 @@
+<HTML>
+<Head>
+<Title>OptionalPointee Concept</Title>
+</HEAD>
+<BODY BGCOLOR="#ffffff" LINK="#0000ee" TEXT="#000000" VLINK="#551a8b" 
+        ALINK="#ff0000"> 
+<IMG SRC="../../c++boost.gif" 
+     ALT="C++ Boost" width="277" height="86"> 
+<!--end header-->
+<BR Clear>
+<H1>Concept: OptionalPointee</H1>
+
+<h3>Description</h3>
+A type is a model of <i>OptionalPointee</i> if it points to (or refers to) a value 
+that may not exist. That is, if it has a <b>pointee</b> which might be <b>valid</b>
+(existent) or <b>invalid</b> (inexistent); and it is possible to test whether the 
+pointee is valid or not.
+This model does <u>not</u> imply pointer semantics: i.e., it does not imply shallow copy nor
+aliasing.
+<h3>Notation</h3>
+<Table>
+  <TR>
+    <TD VAlign=top> <tt>T</tt> </TD>
+    <TD VAlign=top> is a type that is a model of OptionalPointee</TD>
+  </TR>
+  <TR>
+    <TD VAlign=top> <tt>t</tt> </TD>
+    <TD VAlign=top> is an object of type <tt>T</tt> or possibly <tt>const T</tt></TD>
+  </tr>
+</table>
+<h3>Definitions</h3>
+<h3>Valid expressions</h3>
+<Table border>
+  <TR>
+    <TH> Name </TH>
+    <TH> Expression </TH>
+    <TH> Return type </TH>
+    <TH> Semantics </TH>
+  </TR>
+  <TR>
+    <TD VAlign=top>Value Access</TD>
+    <TD VAlign=top>&nbsp;<tt>*t</tt></TD>
+    <TD VAlign=top>&nbsp;<tt>T&amp;</tt></TD>
+    <TD VAlign=top>If the pointee is valid returns a reference to
+      the pointee.<br>
+      If the pointee is invalid the result is <i>undefined</i>.</TD>
+    <TD VAlign=top> </TD>
+  </TR>
+  <TR>
+    <TD VAlign=top>Value Access</TD>
+    <TD VAlign=top>&nbsp;<tt>t-><i>xyz</i></tt></TD>
+    <TD VAlign=top>&nbsp;<tt>T*</tt></TD>
+    <TD VAlign=top>If the pointee is valid returns a builtin pointer to the pointee.<br>
+      If the pointee is invalid the result is <i>undefined</i> (It might not even return NULL).<br>
+    </TD>
+    <TD VAlign=top> </TD>
+  </TR>
+  <TR>
+    <TD VAlign=top>Validity Test</TD>
+    <TD VAlign=top>&nbsp;<tt>t</tt><br>
+     &nbsp;<tt>t != 0</tt><br>
+     &nbsp;<tt>!!t</tt>
+     </TD>
+    <TD VAlign=top>&nbsp;bool </TD>
+    <TD VAlign=top>If the pointee is valid returns true.<br>
+      If the pointee is invalid returns false.</TD>
+    <TD VAlign=top></TD>
+  </TR>
+  <TR>
+    <TD VAlign=top>Invalidity Test</TD>
+    <TD VAlign=top>&nbsp;<tt>t == 0</tt><br>
+                   &nbsp;<tt>!t</tt>
+    </TD>
+    <TD VAlign=top>&nbsp;bool </TD>
+    <TD VAlign=top>If the pointee is valid returns false.<br>
+      If the pointee is invalid returns true.</TD>
+    <TD VAlign=top></TD>
+  </TR>
+</table>
+
+
+<h3>Models</h3>
+
+<UL>
+  <LI><tt>pointers, both builtin and smart.</tt>
+  <LI><tt>boost::optional&lt;&gt;</tt>
+</UL>
+
+<HR>
+<h3>OptionalPointee and relational operations</h3>
+<p>This concept does not define any particular semantic for relational operations, therefore,
+a type which models this concept might have either shallow or deep relational semantics.<br>
+For instance, pointers, which are models of OptionalPointee, have shallow relational operators:
+comparisons of pointers do not involve comparisons of pointees.
+This makes sense for pointers because they have shallow copy semantics.<br>
+But boost::optional&lt;T&gt;, on the other hand, which is also a model of OptionalPointee, has
+deep-copy and deep-relational semantics.<br>
+If generic code is written for this concept, it is important not to use relational
+operators directly because the semantics might be different depending on the actual type.<br>
+Still, the concept itsef can be used to define <i>deep</i> relational tests that can
+be used in generic code with any type which models OptionalPointee:</p>
+<a name="equal"></a>
+<p><u>Equivalence relation:</u></p>
+<pre>template&lt;class OptionalPointee&gt;
+inline
+bool equal_pointees ( OptionalPointee const&amp; x, OptionalPointee const&amp; y )
+{
+  return (!x) != (!y) ? false : ( !x ? true : (*x) == (*y) ) ;
+}
+template&lt;class OptionalPointee&gt;
+struct equal_pointees_t : std::binary_function&lt;OptionalPointee,OptionalPointee,bool&gt;
+{
+  bool operator() ( OptionalPointee const& x, OptionalPointee const& y ) const
+    { return equal_pointees(x,y) ; }
+} ;
+</pre>
+<p>The preceding generic function and function object have the following semantics:<br>
+If both <b>x</b> and <b>y</b> have valid pointees, it compares values via <code>(*x == *y)</code>.<br>
+If only one has a valid pointee, returns <code>false</code>.<br>
+If both have invalid pointees, returns <code>true</code>.</p>
+<a name="less"></a>
+<p><u>Less-than relation:</u></p>
+<pre>template&lt;class OptionalPointee&gt;
+inline
+bool less_pointees ( OptionalPointee const&amp; x, OptionalPointee const&amp; y )
+{
+  return !y ? false : ( !x ? true : (*x) < (*y) ) ;
+}
+template&lt;class OptionalPointee&gt;
+struct less_pointees_t : std::binary_function&lt;OptionalPointee,OptionalPointee,bool&gt;
+{
+  bool operator() ( OptionalPointee const& x, OptionalPointee const& y ) const
+    { return less_pointees(x,y) ; }
+} ;
+</pre>
+<p>The preceding generic function and function object have the following semantics:<br>
+If <b>y</b> has an invalid pointee, returns <code>false</code>.<br>
+Else, if <b>x</b> has an invalid pointee, returns <code>true</code>.<br>
+Else, ( <b>x</b> and <b>y</b> have valid pointees), compares values via <code>(*x &lt; 
+*y).</code></p>
+<p><br>
+All these functions and function 
+objects are is implemented in <a href="../../boost/utility/compare_pointees.hpp">compare_pointees.hpp</a></p>
+<p>Notice that OptionalPointee does not imply aliasing (and optional&lt;&gt; for instance does not alias);
+so direct usage of relational operators with the implied aliasing of shallow semantics
+-as with pointers- should not be used with generic code written for this concept.</p>
+
+<br>
+<HR>
+<TABLE>
+<TR valign=top>
+<TD nowrap>Copyright &copy 2003</TD><TD>
+<A HREF="mailto:fernando_cacciola@hotmail.com">Fernando Cacciola</A>,
+based on the original concept developed by Augustus Saunders.
+</TD></TR></TABLE>
+
+</BODY>
+</HTML>
--- a/addressof_test.cpp
+++ b/addressof_test.cpp
@ -0,0 +1,46 @@
+// Copyright (C) 2002 Brad King (brad.king@kitware.com) 
+//                    Doug Gregor (gregod@cs.rpi.edu)
+//
+// Permission to copy, use, sell and distribute this software is granted
+// provided this copyright notice appears in all copies.
+// Permission to modify the code and to distribute modified code is granted
+// provided this copyright notice appears in all copies, and a notice
+// that the code was modified is included with the copyright notice.
+//
+// This software is provided "as is" without express or implied warranty,
+// and with no claim as to its suitability for any purpose.
+
+// For more information, see http://www.boost.org
+
+#define BOOST_INCLUDE_MAIN
+#include <boost/test/test_tools.hpp>
+#include <boost/utility.hpp>
+
+struct useless_type {};
+
+class nonaddressable {
+public:
+  void dummy(); // Silence GCC warning: all member of class are private
+
+private:
+  useless_type operator&() const;
+};
+
+int test_main(int, char*[])
+{
+  nonaddressable* px = new nonaddressable();
+
+  nonaddressable& x = *px;
+  BOOST_TEST(boost::addressof(x) == px);
+
+  const nonaddressable& cx = *px;
+  BOOST_TEST(boost::addressof(cx) == static_cast<const nonaddressable*>(px));
+
+  volatile nonaddressable& vx = *px;
+  BOOST_TEST(boost::addressof(vx) == static_cast<volatile nonaddressable*>(px));
+
+  const volatile nonaddressable& cvx = *px;
+  BOOST_TEST(boost::addressof(cvx) == static_cast<const volatile nonaddressable*>(px));
+  
+  return 0;
+}
--- a/assert.html
+++ b/assert.html
@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+		<title>Boost: assert.hpp documentation</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	</head>
+	<body bgcolor="white" style="MARGIN-LEFT: 5%; MARGIN-RIGHT: 5%">
+		<table border="0" width="100%">
+			<tr>
+				<td width="277">
+					<img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" width="277" height="86">
+				</td>
+				<td align="middle">
+					<h1>assert.hpp</h1>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2" height="64">&nbsp;</td>
+			</tr>
+		</table>
+		<p>
+			The header <STRONG>&lt;boost/assert.hpp&gt;</STRONG> defines the macro <b>BOOST_ASSERT</b>, 
+			which is similar to the standard <STRONG>assert</STRONG> macro defined in <STRONG>&lt;cassert&gt;</STRONG>. 
+			The macro is intended to be used in Boost libraries.
+		</p>
+		<P>By default, <tt>BOOST_ASSERT(expr)</tt> is equivalent to <tt>assert(expr)</tt>.</P>
+		<P>When the macro <STRONG>BOOST_DISABLE_ASSERTS</STRONG> is defined when <STRONG>&lt;boost/assert.hpp&gt;</STRONG>
+			is included, <tt>BOOST_ASSERT(expr)</tt> is defined as <tt>((void)0)</tt>. This 
+			allows users to selectively disable <STRONG>BOOST_ASSERT</STRONG> without 
+			affecting the definition of the standard <STRONG>assert</STRONG>.</P>
+		<P>When the macro <STRONG>BOOST_ENABLE_ASSERT_HANDLER</STRONG> is defined when <STRONG>&lt;boost/assert.hpp&gt;</STRONG>
+			is included, <tt>BOOST_ASSERT(expr)</tt> evaluates <b>expr</b> and, if the 
+			result is false, evaluates the expression</P>
+		<P><tt>::boost::assertion_failed(#expr, <a href="current_function.html">BOOST_CURRENT_FUNCTION</a>, 
+				__FILE__, __LINE__)</tt></P>
+		<P><STRONG>assertion_failed</STRONG> is declared in <STRONG>&lt;boost/assert.hpp&gt;</STRONG>
+			as</P>
+		<pre>
+namespace boost
+{
+
+void assertion_failed(char const * expr, char const * function, char const * file, long line);
+
+}
+</pre>
+		<p>but it is never defined. The user is expected to supply an appropriate 
+			definition.</p>
+		<P>As is the case with <STRONG>&lt;cassert&gt;</STRONG>, <STRONG>&lt;boost/assert.hpp&gt;</STRONG>
+			can be included multiple times in a single translation unit. <STRONG>BOOST_ASSERT</STRONG>
+			will be redefined each time as specified above.</P>
+		<p><br>
+			<small>Copyright <20> 2002 by Peter Dimov. Permission to copy, use, modify, sell and 
+				distribute this document is granted provided this copyright notice appears in 
+				all copies. This document is provided "as is" without express or implied 
+				warranty, and with no claim as to its suitability for any purpose.</small></p>
+	</body>
+</html>
--- a/assert_test.cpp
+++ b/assert_test.cpp
@ -1,10 +1,3 @@
-#if defined(_MSC_VER) && !defined(__ICL)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
 //
 //  assert_test.cpp - a test for boost/assert.hpp
 //
@ -16,18 +9,97 @@
 //  warranty, and with no claim as to its suitability for any purpose.
 //

-#define BOOST_DEBUG 1
+#include <boost/detail/lightweight_test.hpp>

+#include <boost/assert.hpp>
+
+void test_default()
+{
+    int x = 1;
+
+    BOOST_ASSERT(1);
+    BOOST_ASSERT(x);
+    BOOST_ASSERT(x == 1);
+    BOOST_ASSERT(&x);
+}
+
+#define BOOST_DISABLE_ASSERTS
+#include <boost/assert.hpp>
+
+void test_disabled()
+{
+    int x = 1;
+
+    BOOST_ASSERT(1);
+    BOOST_ASSERT(x);
+    BOOST_ASSERT(x == 1);
+    BOOST_ASSERT(&x);
+
+    BOOST_ASSERT(0);
+    BOOST_ASSERT(!x);
+    BOOST_ASSERT(x == 0);
+
+    void * p = 0;
+
+    BOOST_ASSERT(p);
+
+    // supress warnings
+    p = &x;
+    p = &p;
+}
+
+#undef BOOST_DISABLE_ASSERTS
+
+#define BOOST_ENABLE_ASSERT_HANDLER
 #include <boost/assert.hpp>
 #include <cstdio>

-bool boost_error(char const * expr, char const * func, char const * file, long line)
+int handler_invoked = 0;
+
+void boost::assertion_failed(char const * expr, char const * function, char const * file, long line)
 {
-    std::printf("%s(%ld): Assertion '%s' failed in function '%s'\n", file, line, expr, func);
-    return true; // fail w/ standard assert()
+    std::printf("Expression: %s\nFunction: %s\nFile: %s\nLine: %ld\n\n", expr, function, file, line);
+    ++handler_invoked;
 }

+struct X
+{
+    static void f()
+    {
+        BOOST_ASSERT(0);
+    }
+};
+
+void test_handler()
+{
+    int x = 1;
+
+    BOOST_ASSERT(1);
+    BOOST_ASSERT(x);
+    BOOST_ASSERT(x == 1);
+    BOOST_ASSERT(&x);
+
+    BOOST_ASSERT(0);
+    BOOST_ASSERT(!x);
+    BOOST_ASSERT(x == 0);
+
+    void * p = 0;
+
+    BOOST_ASSERT(p);
+
+    X::f();
+
+    BOOST_ASSERT(handler_invoked == 5);
+    BOOST_TEST(handler_invoked == 5);
+}
+
+#undef BOOST_ENABLE_ASSERT_HANDLER
+
 int main()
 {
-    BOOST_ASSERT(0 == 1);
+    test_default();
+    test_disabled();
+    test_handler();
+
+    return boost::report_errors();
 }
--- a/base_from_member.html
+++ b/base_from_member.html
@ -64,11 +64,12 @@ public:
 </pre></blockquote>

 <p>This is undefined because C++'s initialization order mandates that
-the base class is initialized before the member it uses.  Ron Klatchko
-developed a way around this by using the initialization order in his
-favor.  Base classes are intialized in order of declaration, so moving
-the desired member to another base class, that is initialized before the
-desired base class, can ensure proper initialization.</p>
+the base class is initialized before the member it uses.  <a
+href="http://www.moocat.org">R. Samuel Klatchko</a> developed a way
+around this by using the initialization order in his favor.  Base
+classes are intialized in order of declaration, so moving the desired
+member to another base class, that is initialized before the desired
+base class, can ensure proper initialization.</p>

 <p>A custom base class can be made for this idiom:</p>

@ -108,7 +109,13 @@ public:
 };
 </pre></blockquote>

-<p>Other projects can use similar custom base classes.  The technique is basic enough to make a template, with a sample template class in this library.  The main template parameter is the type of the enclosed member.  The template class has several (explicit) constructor member templates, which implicitly type the constructor arguments and pass them to the member.  The template class uses implicit copy construction and assignment, cancelling them if the enclosed member is non-copyable.</p>
+<p>Other projects can use similar custom base classes.  The technique
+is basic enough to make a template, with a sample template class in
+this library.  The main template parameter is the type of the enclosed
+member.  The template class has several (explicit) constructor member
+templates, which implicitly type the constructor arguments and pass them
+to the member.  The template class uses implicit copy construction and
+assignment, cancelling them if the enclosed member is non-copyable.</p>

 <p>Manually coding a base class may be better if the construction
 and/or copying needs are too complex for the supplied template class,
@ -129,15 +136,21 @@ class boost::base_from_member
 protected:
    MemberType  member;

-    explicit  base_from_member();
+    base_from_member();

    template&lt; typename T1 &gt;
    explicit  base_from_member( T1 x1 );

+    template&lt; typename T1, typename T2 &gt;
+    base_from_member( T1 x1, T2 x2 );
+
    //...

-    template&lt; typename T1, typename T2, typename T3 &gt;
-    explicit  base_from_member( T1 x1, T2 x2, T3 x3 );
+    template&lt; typename T1, typename T2, typename T3, typename T4,
+     typename T5, typename T6, typename T7, typename T8, typename T9,
+     typename T10 &gt;
+    base_from_member( T1 x1, T2 x2, T3 x3, T4 x4, T5 x5, T6 x6, T7 x7,
+     T8 x8, T9 x9, T10 x10 );
 };
 </pre></blockquote>

@ -152,7 +165,7 @@ for later base classes (or itself).</p>

 <p>There is a default constructor and several constructor member
 templates.  These constructor templates can take as many arguments
-(currently up to three) as possible and pass them to a constructor of
+(currently up to ten) as possible and pass them to a constructor of
 the data member.  Since C++ does not allow any way to explicitly state
 the template parameters of a templated constructor, make sure that
 the arguments are already close as possible to the actual type used in
@ -313,7 +326,9 @@ with the exact pointer type used in <code>switcher</code>'s constructor.</p>
 	<dt><a href="../../people/ed_brey.htm">Ed Brey</a>
 	<dd>Suggested some interface changes.

-	<dt>Ron Klatchko (<a href="mailto:ron@crl.com">ron@crl.com</a>)
+	<dt><a href="http://www.moocat.org">R. Samuel Klatchko</a> (<a
+	href="mailto:rsk@moocat.org">rsk@moocat.org</a>, <a
+	href="mailto:rsk@brightmail.com">rsk@brightmail.com</a>)
 	<dd>Invented the idiom of how to use a class member for initializing
 		a base class.

@ -329,13 +344,12 @@ with the exact pointer type used in <code>switcher</code>'s constructor.</p>

 <hr>

-<p>Revised: 22 August 2001</p>
+<p>Revised: 14 June 2003</p>

-<p>Copyright &copy; boost.org 2001.  Permission to copy, use, modify,
-sell and distribute this document is granted provided this copyright
-notice appears in all copies.  This document is provided &quot;as
-is&quot; without express or implied warranty, and with no claim as to
-its suitability for any purpose.</p>
+<p>Copyright 2001, 2003 Daryle Walker.  Use, modification, and distribution
+are subject to the Boost Software License, Version 1.0.  (See accompanying
+file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or a copy at &lt;<a
+href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>&gt;.)</p>

 </body>
 </html>
--- a/base_from_member_test.cpp
+++ b/base_from_member_test.cpp
@ -1,22 +1,20 @@
 //  Boost test program for base-from-member class templates  -----------------//

-//  (C) Copyright Daryle Walker 2001.  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.
+//  Copyright 2001, 2003 Daryle Walker.  Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0.  (See accompanying file
+//  LICENSE_1_0.txt or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)

-//  See http://www.boost.org for most recent version including documentation.
+//  See <http://www.boost.org/libs/utility/> for the library's home page.

 //  Revision History
+//  14 Jun 2003  Adjusted code for Boost.Test changes (Daryle Walker)
 //  29 Aug 2001  Initial Version (Daryle Walker)

-#define  BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>  // for BOOST_TEST, main
+#include <boost/test/minimal.hpp>  // for BOOST_CHECK, main

-#include <boost/config.hpp>   // for BOOST_NO_MEMBER_TEMPLATES
-#include <boost/cstdlib.hpp>  // for boost::exit_success
-#include <boost/utility.hpp>  // for boost::noncopyable
+#include <boost/config.hpp>       // for BOOST_NO_MEMBER_TEMPLATES
+#include <boost/cstdlib.hpp>      // for boost::exit_success
+#include <boost/noncopyable.hpp>  // for boost::noncopyable

 #include <boost/utility/base_from_member.hpp>  // for boost::base_from_member

@ -177,11 +175,11 @@ object_registrar  obj_reg;
 int
 test_main( int , char * [] )
 {
-    BOOST_TEST( obj_reg.db_.empty() );
-    BOOST_TEST( obj_reg.defrauders_in_.empty() );
-    BOOST_TEST( obj_reg.defrauders_out_.empty() );
-    BOOST_TEST( obj_reg.overeager_.empty() );
-    BOOST_TEST( obj_reg.overkilled_.empty() );
+    BOOST_CHECK( obj_reg.db_.empty() );
+    BOOST_CHECK( obj_reg.defrauders_in_.empty() );
+    BOOST_CHECK( obj_reg.defrauders_out_.empty() );
+    BOOST_CHECK( obj_reg.overeager_.empty() );
+    BOOST_CHECK( obj_reg.overkilled_.empty() );

    // Make a separate block to examine pre- and post-effects
    {
@ -189,20 +187,20 @@ test_main( int , char * [] )
        using std::endl;

        bad_class  bc;
-        BOOST_TEST( obj_reg.db_.size() == 3 );
-        BOOST_TEST( obj_reg.defrauders_in_.size() == 1 );
+        BOOST_CHECK( obj_reg.db_.size() == 3 );
+        BOOST_CHECK( obj_reg.defrauders_in_.size() == 1 );

        good_class_1  gc1;
-        BOOST_TEST( obj_reg.db_.size() == 6 );
-        BOOST_TEST( obj_reg.defrauders_in_.size() == 1 );
+        BOOST_CHECK( obj_reg.db_.size() == 6 );
+        BOOST_CHECK( obj_reg.defrauders_in_.size() == 1 );

        good_class_2  gc2;
-        BOOST_TEST( obj_reg.db_.size() == 11 );
-        BOOST_TEST( obj_reg.defrauders_in_.size() == 1 );
+        BOOST_CHECK( obj_reg.db_.size() == 11 );
+        BOOST_CHECK( obj_reg.defrauders_in_.size() == 1 );

-        BOOST_TEST( obj_reg.defrauders_out_.empty() );
-        BOOST_TEST( obj_reg.overeager_.empty() );
-        BOOST_TEST( obj_reg.overkilled_.empty() );
+        BOOST_CHECK( obj_reg.defrauders_out_.empty() );
+        BOOST_CHECK( obj_reg.overeager_.empty() );
+        BOOST_CHECK( obj_reg.overkilled_.empty() );

        // Getting the addresses of the objects ensure
        // that they're used, and not optimized away.
@ -211,11 +209,11 @@ test_main( int , char * [] )
        cout << "Object 'gc2' is at " << &gc2 << '.' << endl;
    }

-    BOOST_TEST( obj_reg.db_.empty() );
-    BOOST_TEST( obj_reg.defrauders_in_.size() == 1 );
-    BOOST_TEST( obj_reg.defrauders_out_.size() == 1 );
-    BOOST_TEST( obj_reg.overeager_.empty() );
-    BOOST_TEST( obj_reg.overkilled_.empty() );
+    BOOST_CHECK( obj_reg.db_.empty() );
+    BOOST_CHECK( obj_reg.defrauders_in_.size() == 1 );
+    BOOST_CHECK( obj_reg.defrauders_out_.size() == 1 );
+    BOOST_CHECK( obj_reg.overeager_.empty() );
+    BOOST_CHECK( obj_reg.overkilled_.empty() );

    return boost::exit_success;
 }
--- a/binary_search_test.cpp
+++ b/binary_search_test.cpp
@ -14,6 +14,7 @@
 #include <list>
 #include <algorithm>
 #include <boost/detail/binary_search.hpp>
+#include <boost/detail/workaround.hpp>

 #if defined(__SGI_STL_PORT) ? defined(__SGI_STL_OWN_IOSTREAMS) : (!defined(__GNUC__) || __GNUC__ > 2)
 # define USE_SSTREAM
@ -27,7 +28,16 @@

 namespace {

-typedef std::vector<std::string> string_vector;
+// In order to get ADL to find the comparison operators defined below, they have
+struct mystring : std::string
+{
+    typedef std::string base;
+    
+    mystring(std::string const& x)
+        : base(x) {}
+};
+
+typedef std::vector<mystring> string_vector;

 const std::size_t sequence_length = 1000;

@ -74,20 +84,21 @@ struct cmp
    }
 };

-inline bool operator<(const std::string& x, const unsigned y)
+inline bool operator<(const mystring& x, const unsigned y)
 {
    return to_int(x) < y;
 }

-inline bool operator<(const unsigned y, const std::string& x)
+inline bool operator<(const unsigned y, const mystring& x)
 {
    return y < to_int(x);
 }

-template <class T> void sort_by_value(T&);
+template <class T>
+void sort_by_value(T& x);

-template <>
-void sort_by_value(std::vector<std::string>& v)
+template <class T>
+void sort_by_value_(T& v, long)
 {
    std::sort(v.begin(), v.end(), cmp());
 }
@ -103,28 +114,26 @@ void random_sorted_sequence(T& seq)
    sort_by_value(seq);
 }

-# if defined(BOOST_MSVC) && !defined(__SGI_STL_PORT)
+template <class T, class A>
+void sort_by_value_(std::list<T,A>& l, int)
+{
+# if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) && !defined(__SGI_STL_PORT)
 // VC6's standard lib doesn't have a template member function for list::sort()
-template <>
-void random_sorted_sequence(std::list<std::string>& result)
-{
-    std::vector<std::string> seq;
+    std::vector<T> seq;
    seq.reserve(sequence_length);
-    for (std::size_t i = 0; i < sequence_length; ++i)
-    {
-        push_back_random_number_string(seq);
-    }
+    std::copy(l.begin(), l.end(), std::back_inserter(seq));
    sort_by_value(seq);
-    result.resize(seq.size());
-    std::copy(seq.begin(), seq.end(), result.begin());
-}
-#else
-template <>
-inline void sort_by_value(std::list<std::string>& l)
-{
+    std::copy(seq.begin(), seq.end(), l.begin());
+# else
    l.sort(cmp());
-}
 # endif
+}
+
+template <class T>
+void sort_by_value(T& x)
+{
+    (sort_by_value_)(x, 1);
+}

 // A way to select the comparisons with/without a Compare parameter for testing.
 template <class Compare> struct searches
@ -233,13 +242,13 @@ void test_loop(Sequence& x, Compare cmp, unsigned long test_count)

 int main()
 {
-    std::vector<std::string> x;
+    string_vector x;
    std::cout << "=== testing random-access iterators with <: ===\n";
    test_loop(x, no_compare(), 25);
    std::cout << "=== testing random-access iterators with compare: ===\n";
    test_loop(x, cmp(), 25);
    
-    std::list<std::string> y;
+    std::list<mystring> y;
    std::cout << "=== testing bidirectional iterators with <: ===\n";
    test_loop(y, no_compare(), 25);
    std::cout << "=== testing bidirectional iterators with compare: ===\n";
--- a/call_traits.htm
+++ b/call_traits.htm
@ -5,7 +5,7 @@
 content="text/html; charset=iso-8859-1">
 <meta name="Template"
 content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
+<meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
 <title>Call Traits</title>
 </head>

@ -592,7 +592,8 @@ would prevent template argument deduction from functioning.</p>
 <p>The call_traits template will &quot;optimize&quot; the passing
 of a small built-in type as a function parameter, this mainly has
 an effect when the parameter is used within a loop body. In the
-following example (see <a href="algo_opt_examples.cpp">algo_opt_examples.cpp</a>),
+following example (see <a
+href="../type_traits/examples/fill_example.cpp">fill_example.cpp</a>),
 a version of std::fill is optimized in two ways: if the type
 passed is a single byte built-in type then std::memset is used to
 effect the fill, otherwise a conventional C++ implemention is
@ -748,10 +749,11 @@ no claim as to its suitability for any purpose.</p>
 <p>Based on contributions by Steve Cleary, Beman Dawes, Howard
 Hinnant and John Maddock.</p>

-<p>Maintained by <a href="mailto:John_Maddock@compuserve.com">John
+<p>Maintained by <a href="mailto:john@johnmaddock.co.uk">John
 Maddock</a>, the latest version of this file can be found at <a
 href="http://www.boost.org/">www.boost.org</a>, and the boost
-discussion list at <a href="http://www.yahoogroups.com/list/boost">www.yahoogroups.com/list/boost</a>.</p>
+discussion list at <a
+href="http://www.yahoogroups.com/list/boost">www.yahoogroups.com/list/boost</a>.</p>

 <p>.</p>

--- a/call_traits_test.cpp
+++ b/call_traits_test.cpp
@ -1,9 +1,10 @@
- // boost::compressed_pair test program   
+//  boost::compressed_pair test program   
    
- //  (C) Copyright John Maddock 2000. 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.   
+//  (C) Copyright John Maddock 2000. 
+//  Use, modification and distribution are 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).
+

 // standalone test program for <boost/call_traits.hpp>
 // 18 Mar 2002:
@ -408,7 +409,7 @@ template struct call_traits_test<int[2], true>;
 #endif
 #endif

-#ifdef BOOST_MSVC
+#if defined(BOOST_MSVC) && _MSC_VER <= 1300
 unsigned int expected_failures = 14;
 #elif defined(__SUNPRO_CC)
 #if(__SUNPRO_CC <= 0x520)
--- a/checked_delete.html
+++ b/checked_delete.html
@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+		<title>Boost: checked_delete.hpp documentation</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	</head>
+	<body bgcolor="white" style="MARGIN-LEFT: 5%; MARGIN-RIGHT: 5%">
+		<table border="0" width="100%">
+			<tr>
+				<td width="277">
+					<img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" width="277" height="86">
+				</td>
+				<td align="middle">
+					<h1>checked_delete.hpp</h1>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2" height="64">&nbsp;</td>
+			</tr>
+		</table>
+		<p>
+			The header <STRONG>&lt;boost/checked_delete.hpp&gt;</STRONG> defines two 
+			function templates, <STRONG>checked_delete</STRONG> and <STRONG>checked_array_delete</STRONG>, 
+			and two class templates, <STRONG>checked_deleter</STRONG> and <STRONG>checked_array_deleter</STRONG>.
+		</p>
+		<P>The C++ Standard allows, in 5.3.5/5, pointers to incomplete class types to be 
+			deleted with a <EM>delete-expression</EM>. When the class has a non-trivial 
+			destructor, or a class-specific operator delete, the behavior is undefined. 
+			Some compilers issue a warning when an incomplete type is deleted, but 
+			unfortunately, not all do, and programmers sometimes ignore or disable 
+			warnings.</P>
+		<P>A particularly troublesome case is when a smart pointer's destructor, such as <STRONG>
+				boost::scoped_ptr&lt;T&gt;::~scoped_ptr</STRONG>, is instantiated with an 
+			incomplete type. This can often lead to silent, hard to track failures.</P>
+		<P>The supplied function and class templates can be used to prevent these problems, 
+			as they require a complete type, and cause a compilation error otherwise.</P>
+		<h3><a name="Synopsis">Synopsis</a></h3>
+		<pre>
+namespace boost
+{
+
+template&lt;class T&gt; void checked_delete(T * p);
+template&lt;class T&gt; void checked_array_delete(T * p);
+template&lt;class T&gt; struct checked_deleter;
+template&lt;class T&gt; struct checked_array_deleter;
+
+}
+</pre>
+		<h3>checked_delete</h3>
+		<h4><a name="checked_delete">template&lt;class T&gt; void checked_delete(T * p);</a></h4>
+		<blockquote>
+			<p>
+				<b>Requires:</b> <b>T</b> must be a complete type. The expression <tt>delete p</tt>
+				must be well-formed.
+			</p>
+			<p>
+				<b>Effects:</b> <tt>delete p;</tt>
+			</p>
+		</blockquote>
+		<h3>checked_array_delete</h3>
+		<h4><a name="checked_array_delete">template&lt;class T&gt; void checked_array_delete(T 
+				* p);</a></h4>
+		<blockquote>
+			<p>
+				<b>Requires:</b> <b>T</b> must be a complete type. The expression <tt>delete [] p</tt>
+				must be well-formed.
+			</p>
+			<p>
+				<b>Effects:</b> <tt>delete [] p;</tt>
+			</p>
+		</blockquote>
+		<h3>checked_deleter</h3>
+		<pre>
+template&lt;class T&gt; struct checked_deleter
+{
+    typedef void result_type;
+    typedef T * argument_type;
+    void operator()(T * p) const;
+};
+</pre>
+		<h4>void checked_deleter&lt;T&gt;::operator()(T * p) const;</h4>
+		<blockquote>
+			<p>
+				<b>Requires:</b> <b>T</b> must be a complete type. The expression <tt>delete p</tt>
+				must be well-formed.
+			</p>
+			<p>
+				<b>Effects:</b> <tt>delete p;</tt>
+			</p>
+		</blockquote>
+		<h3>checked_array_deleter</h3>
+		<pre>
+template&lt;class T&gt; struct checked_array_deleter
+{
+    typedef void result_type;
+    typedef T * argument_type;
+    void operator()(T * p) const;
+};
+</pre>
+		<h4>void checked_array_deleter&lt;T&gt;::operator()(T * p) const;</h4>
+		<blockquote>
+			<p>
+				<b>Requires:</b> <b>T</b> must be a complete type. The expression <tt>delete [] p</tt>
+				must be well-formed.
+			</p>
+			<p>
+				<b>Effects:</b> <tt>delete [] p;</tt>
+			</p>
+		</blockquote>
+		<h3><a name="Acknowledgements">Acknowledgements</a></h3>
+		<p>
+			The function templates <STRONG>checked_delete</STRONG> and <STRONG>checked_array_delete</STRONG>
+			were originally part of <STRONG>&lt;boost/utility.hpp&gt;</STRONG>, and the 
+			documentation acknowledged Beman Dawes, Dave Abrahams, Vladimir Prus, Rainer 
+			Deyke, John Maddock, and others as contributors.
+		</p>
+		<p>
+			<br>
+			<small>Copyright <20> 2002 by Peter Dimov. Permission to copy, use, modify, sell and 
+				distribute this document is granted provided this copyright notice appears in 
+				all copies. This document is provided "as is" without express or implied 
+				warranty, and with no claim as to its suitability for any purpose.</small></p>
+	</body>
+</html>
--- a/checked_delete_test.cpp
+++ b/checked_delete_test.cpp
@ -1,17 +1,14 @@
 //  Boost checked_delete test program  ---------------------------------------//

-//  (C) Copyright Beman Dawes 2001. 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.
+//  Copyright Beman Dawes 2001.
+//  See accompanying license for terms and conditions of use.

-//  See http://www.boost.org for most recent version including documentation.
+//  See http://www.boost.org/libs/utility for documentation.

 //  Revision History
 //  21 May 01  Initial version (Beman Dawes)

-#include <boost/utility.hpp>  // for checked_delete
+#include <boost/checked_delete.hpp>  // for checked_delete

 //  This program demonstrates compiler errors when trying to delete an
 //  incomplete type.
@ -23,9 +20,8 @@ namespace

 int main()
 {
-    Incomplete * p;
+    Incomplete * p = 0;
    boost::checked_delete(p);          // should cause compile time error
-    Incomplete ** pa;
-    boost::checked_array_delete(pa);   // should cause compile time error
+    boost::checked_array_delete(p);    // should cause compile time error
    return 0;
 }   // main
--- a/compressed_pair.htm
+++ b/compressed_pair.htm
@ -87,7 +87,7 @@ no claim as to its suitability for any purpose.</p>
 <p>Based on contributions by Steve Cleary, Beman Dawes, Howard
 Hinnant and John Maddock.</p>

-<p>Maintained by <a href="mailto:John_Maddock@compuserve.com">John
+<p>Maintained by <a href="mailto:john@johnmaddock.co.uk">John
 Maddock</a>, the latest version of this file can be found at <a
 href="http://www.boost.org">www.boost.org</a>, and the boost
 discussion list at <a
--- a/compressed_pair_test.cpp
+++ b/compressed_pair_test.cpp
@ -1,9 +1,9 @@
- // boost::compressed_pair test program   
+//  boost::compressed_pair test program   
    
- //  (C) Copyright John Maddock 2000. 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.   
+//  (C) Copyright John Maddock 2000. 
+//  Use, modification and distribution are 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).

 // standalone test program for <boost/compressed_pair.hpp>
 // Revised 03 Oct 2000: 
@ -329,7 +329,7 @@ void compressed_pair_array_tester<T1, T2>::test(first_param_type p1, second_para
   BOOST_TEST(sizeof(T2) == sizeof(cp1.second()));
 }

-int test_main(int, char **)
+int test_main(int, char *[])
 {
   // declare some variables to pass to the tester:
   non_empty1 ne1(2);
--- a/counting_iterator.htm
+++ b/counting_iterator.htm
@ -1,325 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Counting Iterator Adaptor Documentation</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-<img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)"
-align="center" width="277" height="86">
-
-<h1>Counting Iterator Adaptor</h1>
-
-Defined in header
-<a href="../../boost/counting_iterator.hpp">boost/counting_iterator.hpp</a>
-
-<p>
-How would you fill up a vector with the numbers zero
-through one hundred using <a
-href="http://www.sgi.com/tech/stl/copy.html"><tt>std::copy()</tt></a>? The
-only iterator operation missing from builtin integer types is an
-<tt>operator*()</tt> that returns the current
-value of the integer.  The counting iterator adaptor adds this crucial piece of
-functionality to whatever type it wraps. One can use the
-counting iterator adaptor not only with integer types, but with any
-type that is <tt>Incrementable</tt> (see type requirements <a href="#requirements">below</a>).  The
-following <b>pseudo-code</b> shows the general idea of how the
-counting iterator is implemented.
-</p>
-
-<pre>
-  // inside a hypothetical counting_iterator class...
-  typedef Incrementable value_type;
-  value_type counting_iterator::operator*() const {
-    return this->base; // no dereference!
-  }
-</pre>
-
-All of the other operators of the counting iterator behave in the same
-fashion as the <tt>Incrementable</tt> base type.
-
-<h2>Synopsis</h2>
-
-<pre>
-namespace boost {
-  template &lt;class Incrementable&gt;
-  struct <a href="#counting_iterator_traits">counting_iterator_traits</a>;
-
-  template &lt;class Incrementable&gt;
-  struct <a href="#counting_iterator_generator">counting_iterator_generator</a>;
-
-  template &lt;class Incrementable&gt;
-  typename counting_iterator_generator&lt;Incrementable&gt;::type
-  <a href="#make_counting_iterator">make_counting_iterator</a>(Incrementable x);
-}
-</pre>
-
-<hr>
-
-<h2><a name="counting_iterator_generator">The Counting Iterator Type
-Generator</a></h2>
-
-The class template <tt>counting_iterator_generator&lt;Incrementable&gt;</tt> is a <a href="../../more/generic_programming.html#type_generator">type generator</a> for counting iterators.
-
-<pre>
-template &lt;class Incrementable&gt;
-class counting_iterator_generator
-{
-public:
-    typedef <a href="./iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt;...&gt; type;
-};
-</pre>
-
-<h3>Example</h3>
-
-In this example we use the counting iterator generator to create a
-counting iterator, and count from zero to four.
-
-<pre>
-#include &lt;boost/config.hpp&gt;
-#include &lt;iostream&gt;
-#include &lt;boost/counting_iterator.hpp&gt;
-
-int main(int, char*[])
-{
-  // Example of using counting_iterator_generator
-  std::cout &lt;&lt; "counting from 0 to 4:" &lt;&lt; std::endl;
-  boost::counting_iterator_generator&lt;int&gt;::type first(0), last(4);
-  std::copy(first, last, std::ostream_iterator&lt;int&gt;(std::cout, " "));
-  std::cout &lt;&lt; std::endl;
-
-  // to be continued...
-</pre>
-The output from this part is:
-<pre>
-counting from 0 to 4:
-0 1 2 3 
-</pre>
-
-<h3>Template Parameters</h3>
-
-<Table border>
-<TR>
-<TH>Parameter</TH><TH>Description</TH>
-</TR>
-
-<TR>
-<TD><tt>Incrementable</tt></TD>
-<TD>The type being wrapped by the adaptor.</TD>
-</TR>
-
-</Table>
-
-<h3>Model of</h3>
-
-If the <tt>Incrementable</tt> type has all of the functionality of a
-<a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-Access Iterator</a> except the <tt>operator*()</tt>, then the counting
-iterator will be a model of <a
-href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-Access Iterator</a>. If the <tt>Incrementable</tt> type has less
-functionality, then the counting iterator will have correspondingly
-less functionality.
-
-<h3><a name="requirements">Type Requirements</a></h3>
-
-The <tt>Incrementable</tt> type must be <a
-href="http://www.sgi.com/tech/stl/DefaultConstructible.html">Default
-Constructible</a>, <a href="./CopyConstructible.html">Copy
-Constructible</a>, and <a href="./Assignable.html">Assignable</a>.
-Also, the <tt>Incrementable</tt> type must provide access to an
-associated <tt>difference_type</tt> and <tt>iterator_category</tt>
-through the <a
-href="#counting_iterator_traits"><tt>counting_iterator_traits</tt></a>
-class.
-
-<p>
-Furthermore, if you wish to create a counting iterator that is a <a
-href="http://www.sgi.com/tech/stl/ForwardIterator.html"> Forward
-Iterator</a>, then the following expressions must be valid:
-<pre>
-Incrementable i, j;
-++i         // pre-increment
-i == j      // operator equal
-</pre>
-If you wish to create a counting iterator that is a <a
-href="http://www.sgi.com/tech/stl/BidirectionalIterator.html">
-Bidirectional Iterator</a>, then pre-decrement is also required:
-<pre>
--i
-</pre>
-If you wish to create a counting iterator that is a <a
-href="http://www.sgi.com/tech/stl/RandomAccessIterator.html"> Random
-Access Iterator</a>, then these additional expressions are also required:
-<pre>
-<a href="#counting_iterator_traits">counting_iterator_traits</a>&lt;Incrementable&gt;::difference_type n;
-i += n
-n = i - j
-i < j
-</pre>
-
-
-
-<h3>Members</h3>
-
-The counting iterator type implements the member functions and
-operators required of the <a
-href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-Access Iterator</a> concept. In addition it has the following
-constructor:
-
-<pre>
-counting_iterator_generator::type(const Incrementable&amp; i)
-</pre>
-
-<p>
-<hr>
-<p>
-
-
-<h2><a name="make_counting_iterator">The Counting Iterator Object Generator</a></h2>
-
-<pre>
-template &lt;class Incrementable&gt;
-typename counting_iterator_generator&lt;Incrementable&gt;::type
-make_counting_iterator(Incrementable base);
-</pre>
-
-An <a href="../../more/generic_programming.html#object_generator">object
-generator</a> function that provides a convenient way to create counting
-iterators.<p>
-
-
-
-<h3>Example</h3>
-
-In this example we count from negative five to positive five, this
-time using the <tt>make_counting_iterator()</tt> function to save some
-typing.
-
-<pre>
-  // continuing from previous example...
-
-  std::cout &lt;&lt; "counting from -5 to 4:" &lt;&lt; std::endl;
-  std::copy(boost::make_counting_iterator(-5),
-	    boost::make_counting_iterator(5),
-	    std::ostream_iterator&lt;int&gt;(std::cout, " "));
-  std::cout &lt;&lt; std::endl;
-
-  // to be continued...
-</pre>
-The output from this part is:
-<pre>
-counting from -5 to 4:
-5 -4 -3 -2 -1 0 1 2 3 4 
-</pre>
-
-In the next example we create an array of numbers, and then create a
-second array of pointers, where each pointer is the address of a
-number in the first array. The counting iterator makes it easy to do
-this since dereferencing a counting iterator that is wrapping an
-iterator over the array of numbers just returns a pointer to the
-current location in the array. We then use the <a
-href="./indirect_iterator.htm">indirect iterator adaptor</a> to print
-out the number in the array by accessing the numbers through the array
-of pointers.
-
-<pre>
-  // continuing from previous example...
-
-  const int N = 7;
-  std::vector&lt;int&gt; numbers;
-  // Fill "numbers" array with [0,N)
-  std::copy(boost::make_counting_iterator(0), boost::make_counting_iterator(N),
-	    std::back_inserter(numbers));
-
-  std::vector&lt;std::vector&lt;int&gt;::iterator&gt; pointers;
-
-  // Use counting iterator to fill in the array of pointers.
-  std::copy(boost::make_counting_iterator(numbers.begin()),
-	    boost::make_counting_iterator(numbers.end()),
-	    std::back_inserter(pointers));
-
-  // Use indirect iterator to print out numbers by accessing
-  // them through the array of pointers.
-  std::cout &lt;&lt; "indirectly printing out the numbers from 0 to " 
-	    &lt;&lt; N &lt;&lt; std::endl;
-  std::copy(boost::make_indirect_iterator(pointers.begin()),
-	    boost::make_indirect_iterator(pointers.end()),
-	    std::ostream_iterator&lt;int&gt;(std::cout, " "));
-  std::cout &lt;&lt; std::endl;
-</pre>
-The output is:
-<pre>
-indirectly printing out the numbers from 0 to 7
-0 1 2 3 4 5 6 
-</pre>
-
-<hr>
-
-<h2><a name="counting_iterator_traits">Counting Iterator Traits</a></h2>
-
-The counting iterator adaptor needs to determine the appropriate
-<tt>difference_type</tt> and <tt>iterator_category</tt> to use based on the
-<tt>Incrementable</tt> type supplied by the user.  The
-<tt>counting_iterator_traits</tt> class provides these types.  If the
-<tt>Incrementable</tt> type is an integral type or an iterator, these types
-will be correctly deduced by the <tt>counting_iterator_traits</tt> provided by
-the library. Otherwise, the user must specialize
-<tt>counting_iterator_traits</tt> for her type or add nested typedefs to
-her type to fulfill the needs of
-<a href="http://www.sgi.com/tech/stl/iterator_traits.html">
-<tt>std::iterator_traits</tt></a>.
-
-<p>The following pseudocode describes how the <tt>counting_iterator_traits</tt> are determined:
-
-<pre>
-template &lt;class Incrementable&gt;
-struct counting_iterator_traits
-{
-  if (numeric_limits&lt;Incrementable&gt::is_specialized) {
-    if (!numeric_limits&lt;Incrementable&gt::is_integer)
-       COMPILE_TIME_ERROR;
-
-    if (!numeric_limits&lt;Incrementable&gt::is_bounded
-        &amp;&amp; numeric_limits&lt;Incrementable&gt;::is_signed) {
-        typedef Incrementable difference_type;
-    }
-    else if (numeric_limits&lt;Incrementable&gt::is_integral) {
-        typedef <i>next-larger-signed-type-or-intmax_t</i> difference_type;
-    }
-    typedef std::random_access_iterator_tag iterator_category;   
-  } else {
-    typedef std::iterator_traits&lt;Incrementable&gt;::difference_type difference_type;
-    typedef std::iterator_traits&lt;Incrementable&gt;::iterator_category iterator_category;
-  }
-};
-</pre>
-
-<p>The italicized sections above are implementation details, but it is important
-to know that the <tt>difference_type</tt> for integral types is selected so that
-it can always represent the difference between two values if such a built-in
-integer exists. On platforms with a working <tt>std::numeric_limits</tt>
-implementation, the <tt>difference_type</tt> for any variable-length signed
-integer type <tt>T</tt> is <tt>T</tt> itself.
-
-<hr>
-<p>Revised <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->19 Aug 2001<!--webbot bot="Timestamp" endspan i-checksum="14767" --></p>
-<p><EFBFBD> Copyright Jeremy Siek 2000. Permission to copy, use,
-modify, sell and distribute this document is granted provided this copyright
-notice appears in all copies. This document is provided &quot;as is&quot;
-without express or implied warranty, and with no claim as to its suitability for
-any purpose.</p>
-
-</body>
-
-</html>
-<!--  LocalWords:  html charset alt gif hpp incrementable const namespace htm
- -->
-<!--  LocalWords:  struct  typename iostream int Siek CopyConstructible pre
- -->
-
--- a/counting_iterator_example.cpp
+++ b/counting_iterator_example.cpp
@ -5,17 +5,18 @@


 #include <boost/config.hpp>
+#include <algorithm>
 #include <iostream>
 #include <iterator>
 #include <vector>
-#include <boost/counting_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
+#include <boost/iterator/counting_iterator.hpp>
+#include <boost/iterator/indirect_iterator.hpp>

 int main(int, char*[])
 {
  // Example of using counting_iterator_generator
  std::cout << "counting from 0 to 4:" << std::endl;
-  boost::counting_iterator_generator<int>::type first(0), last(4);
+  boost::counting_iterator<int> first(0), last(4);
  std::copy(first, last, std::ostream_iterator<int>(std::cout, " "));
  std::cout << std::endl;

@ -27,17 +28,21 @@ int main(int, char*[])
  std::cout << std::endl;

  // Example of using counting iterator to create an array of pointers.
-  const int N = 7;
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+  const
+#endif 
+      int N = 7;
  std::vector<int> numbers;
  // Fill "numbers" array with [0,N)
-  std::copy(boost::make_counting_iterator(0), boost::make_counting_iterator(N),
-            std::back_inserter(numbers));
+  std::copy(
+      boost::make_counting_iterator(0)
+      , boost::make_counting_iterator(N)
+      , std::back_inserter(numbers));

  std::vector<std::vector<int>::iterator> pointers;

-  // VC6 gets an internal compiler error on this
-#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200)
  // Use counting iterator to fill in the array of pointers.
+  // causes an ICE with MSVC6
  std::copy(boost::make_counting_iterator(numbers.begin()),
            boost::make_counting_iterator(numbers.end()),
            std::back_inserter(pointers));
@ -50,6 +55,6 @@ int main(int, char*[])
            boost::make_indirect_iterator(pointers.end()),
            std::ostream_iterator<int>(std::cout, " "));
  std::cout << std::endl;
-#endif
+  
  return 0;
 }
--- a/counting_iterator_test.cpp
+++ b/counting_iterator_test.cpp
@ -1,269 +0,0 @@
-// (C) Copyright David Abrahams 2001. 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.
-//
-//  See http://www.boost.org for most recent version including documentation.
-//
-// Revision History
-// 16 Feb 2001  Added a missing const. Made the tests run (somewhat) with
-//              plain MSVC again. (David Abrahams)
-// 11 Feb 2001  #if 0'd out use of counting_iterator on non-numeric types in
-//              MSVC without STLport, so that the other tests may proceed
-//              (David Abrahams)
-// 04 Feb 2001  Added use of iterator_tests.hpp (David Abrahams)
-// 28 Jan 2001  Removed not_an_iterator detritus (David Abrahams)
-// 24 Jan 2001  Initial revision (David Abrahams)
-
-#include <boost/config.hpp>
-#ifdef BOOST_MSVC
-# pragma warning(disable:4786) // identifier truncated in debug info
-#endif
-
-#include <boost/pending/iterator_tests.hpp>
-#include <boost/counting_iterator.hpp>
-#include <boost/detail/iterator.hpp>
-#include <iostream>
-#include <climits>
-#include <iterator>
-#include <stdlib.h>
-#ifndef __BORLANDC__
-# include <boost/tuple/tuple.hpp>
-#endif 
-#include <vector>
-#include <list>
-#include <cassert>
-#ifndef BOOST_NO_LIMITS
-# include <limits>
-#endif
-#ifndef BOOST_NO_SLIST
-# include <slist>
-#endif
-
-template <class T> struct is_numeric
-{
-    enum { value = 
-#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
-        std::numeric_limits<T>::is_specialized
-#else
-        // Causes warnings with GCC, but how else can I detect numeric types at
-        // compile-time?
-        (boost::is_convertible<int,T>::value &&
-         boost::is_convertible<T,int>::value)
-#endif
-    };
-};
-
-// Special tests for RandomAccess CountingIterators.
-template <class CountingIterator>
-void category_test(
-    CountingIterator start,
-    CountingIterator finish,
-    std::random_access_iterator_tag)
-{
-    typedef typename
-        boost::detail::iterator_traits<CountingIterator>::difference_type
-        difference_type;
-    difference_type distance = boost::detail::distance(start, finish);
-
-    // Pick a random position internal to the range
-    difference_type offset = (unsigned)rand() % distance;
-    assert(offset >= 0);
-    CountingIterator internal = start;
-    std::advance(internal, offset);
-
-    // Try some binary searches on the range to show that it's ordered
-    assert(std::binary_search(start, finish, *internal));
-
-    // #including tuple crashed borland, so I had to give up on tie().
-    std::pair<CountingIterator,CountingIterator> xy(
-        std::equal_range(start, finish, *internal));
-    CountingIterator x = xy.first, y = xy.second;
-    
-    assert(boost::detail::distance(x, y) == 1);
-
-    // Show that values outside the range can't be found
-    assert(!std::binary_search(start, boost::prior(finish), *finish));
-
-    // Do the generic random_access_iterator_test
-    typedef typename CountingIterator::value_type value_type;
-    std::vector<value_type> v;
-    for (value_type z = *start; z != *finish; ++z)
-        v.push_back(z);
-    if (v.size() >= 2)
-    {
-        // Note that this test requires a that the first argument is
-        // dereferenceable /and/ a valid iterator prior to the first argument
-        boost::random_access_iterator_test(start + 1, v.size() - 1, v.begin() + 1);
-    }
-}
-
-// Special tests for bidirectional CountingIterators
-template <class CountingIterator>
-void category_test(CountingIterator start, CountingIterator finish, std::bidirectional_iterator_tag)
-{
-    if (finish != start
-        && finish != boost::next(start)
-        && finish != boost::next(boost::next(start)))
-    {
-        // Note that this test requires a that the first argument is
-        // dereferenceable /and/ a valid iterator prior to the first argument
-        boost::bidirectional_iterator_test(boost::next(start), boost::next(*start), boost::next(boost::next(*start)));
-    }
-}
-
-template <class CountingIterator>
-void category_test(CountingIterator start, CountingIterator finish, std::forward_iterator_tag)
-{
-    if (finish != start && finish != boost::next(start))
-        boost::forward_iterator_test(start, *start, boost::next(*start));
-}
-
-template <class CountingIterator>
-void test_aux(CountingIterator start, CountingIterator finish)
-{
-    typedef typename CountingIterator::iterator_category category;
-    typedef typename CountingIterator::value_type value_type;
-
-    // If it's a RandomAccessIterator we can do a few delicate tests
-    category_test(start, finish, category());
-    
-    // Okay, brute force...
-    for (CountingIterator p = start; p != finish && boost::next(p) != finish; ++p)
-    {
-        assert(boost::next(*p) == *boost::next(p));
-    }
-
-    // prove that a reference can be formed to these values
-    typedef typename CountingIterator::value_type value;
-    const value* q = &*start;
-    (void)q; // suppress unused variable warning
-}
-
-template <class Incrementable>
-void test(Incrementable start, Incrementable finish)
-{
-    test_aux(boost::make_counting_iterator(start), boost::make_counting_iterator(finish));
-}
-
-template <class Integer>
-void test_integer(Integer* = 0) // default arg works around MSVC bug
-{
-    Integer start = 0;
-    Integer finish = 120;
-    test(start, finish);
-}
-
-template <class Container>
-void test_container(Container* = 0)  // default arg works around MSVC bug
-{
-    Container c(1 + (unsigned)rand() % 1673);
-
-    const typename Container::iterator start = c.begin();
-    
-    // back off by 1 to leave room for dereferenceable value at the end
-    typename Container::iterator finish = start;
-    std::advance(finish, c.size() - 1);
-    
-    test(start, finish);
-
-    typedef typename Container::const_iterator const_iterator;
-    test(const_iterator(start), const_iterator(finish));
-}
-
-class my_int1 {
-public:
-  my_int1() { }
-  my_int1(int x) : m_int(x) { }
-  my_int1& operator++() { ++m_int; return *this; }
-  bool operator==(const my_int1& x) const { return m_int == x.m_int; }
-private:
-  int m_int;
-};
-
-namespace boost {
-  template <>
-  struct counting_iterator_traits<my_int1> {
-    typedef std::ptrdiff_t difference_type;
-    typedef std::forward_iterator_tag iterator_category;
-  };
-}
-
-class my_int2 {
-public:
-  typedef void value_type;
-  typedef void pointer;
-  typedef void reference;
-  typedef std::ptrdiff_t difference_type;
-  typedef std::bidirectional_iterator_tag iterator_category;
-
-  my_int2() { }
-  my_int2(int x) : m_int(x) { }
-  my_int2& operator++() { ++m_int; return *this; }
-  my_int2& operator--() { --m_int; return *this; }
-  bool operator==(const my_int2& x) const { return m_int == x.m_int; }
-private:
-  int m_int;
-};
-
-class my_int3 {
-public:
-  typedef void value_type;
-  typedef void pointer;
-  typedef void reference;
-  typedef std::ptrdiff_t difference_type;
-  typedef std::random_access_iterator_tag iterator_category;
-
-  my_int3() { }
-  my_int3(int x) : m_int(x) { }
-  my_int3& operator++() { ++m_int; return *this; }
-  my_int3& operator+=(std::ptrdiff_t n) { m_int += n; return *this; }
-  std::ptrdiff_t operator-(const my_int3& x) const { return m_int - x.m_int; }
-  my_int3& operator--() { --m_int; return *this; }
-  bool operator==(const my_int3& x) const { return m_int == x.m_int; }
-  bool operator!=(const my_int3& x) const { return m_int != x.m_int; }
-  bool operator<(const my_int3& x) const { return m_int < x.m_int; }
-private:
-  int m_int;
-};
-
-int main()
-{
-    // Test the built-in integer types.
-    test_integer<char>();
-    test_integer<unsigned char>();
-    test_integer<signed char>();
-    test_integer<wchar_t>();
-    test_integer<short>();
-    test_integer<unsigned short>();
-    test_integer<int>();
-    test_integer<unsigned int>();
-    test_integer<long>();
-    test_integer<unsigned long>();
-#if defined(ULLONG_MAX) || defined(ULONG_LONG_MAX)
-    test_integer<long long>();
-    test_integer<unsigned long long>();
-#endif
-
-   // wrapping an iterator or non-built-in integer type causes an INTERNAL
-   // COMPILER ERROR in MSVC without STLport. I'm clueless as to why.
-#if !defined(BOOST_MSVC) || defined(__SGI_STL_PORT)
-    // Test user-defined type.
-    test_integer<my_int1>();
-    test_integer<my_int2>();
-    test_integer<my_int3>();
-    
-   // Some tests on container iterators, to prove we handle a few different categories
-    test_container<std::vector<int> >();
-    test_container<std::list<int> >();
-# ifndef BOOST_NO_SLIST
-    test_container<BOOST_STD_EXTENSION_NAMESPACE::slist<int> >();
-# endif
-
-    // Also prove that we can handle raw pointers.
-    int array[2000];
-    test(boost::make_counting_iterator(array), boost::make_counting_iterator(array+2000-1));
-#endif
-    std::cout << "test successful " << std::endl;
-    return 0;
-}
--- a/current_function.html
+++ b/current_function.html
@ -0,0 +1,38 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+		<title>Boost: current_function.hpp documentation</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	</head>
+	<body bgcolor="white" style="MARGIN-LEFT: 5%; MARGIN-RIGHT: 5%">
+		<table border="0" width="100%">
+			<tr>
+				<td width="277">
+					<img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" width="277" height="86">
+				</td>
+				<td align="middle">
+					<h1>current_function.hpp</h1>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2" height="64">&nbsp;</td>
+			</tr>
+		</table>
+		<p>
+			The header <STRONG>&lt;boost/current_function.hpp&gt;</STRONG> defines a single 
+			macro, <STRONG>BOOST_CURRENT_FUNCTION</STRONG>,<STRONG> </STRONG>similar to the 
+			C99 predefined identifier <STRONG>__func__</STRONG>.
+		</p>
+		<P><STRONG>BOOST_CURRENT_FUNCTION</STRONG> expands to a string literal containing 
+			the (fully qualified, if possible) name of the enclosing function. If there is 
+			no enclosing function, the behavior is undefined.</P>
+		<p>Some compilers do not provide a way to obtain the name of the current enclosing 
+			function. On such compilers, the string literal has an unspecified value.</p>
+		<p>
+			<br>
+			<small>Copyright <20> 2002 by Peter Dimov. Permission to copy, use, modify, sell and 
+				distribute this document is granted provided this copyright notice appears in 
+				all copies. This document is provided "as is" without express or implied 
+				warranty, and with no claim as to its suitability for any purpose.</small></p>
+	</body>
+</html>
--- a/current_function_test.cpp
+++ b/current_function_test.cpp
@ -1,4 +1,6 @@
-#if defined(_MSC_VER) && !defined(__ICL)
+#include <boost/config.hpp>
+
+#if defined(BOOST_MSVC)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
--- a/enable_if.html
+++ b/enable_if.html
@ -0,0 +1,388 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+            "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML>
+<HEAD><TITLE>enable_if</TITLE>
+
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<META name="GENERATOR" content="Microsoft FrontPage 5.0">
+</HEAD>
+<BODY >
+<!--HEVEA command line is: hevea -nosymb -noiso -pedantic -v enable_if_docs_for_boost.tex -->
+<!--HTMLHEAD-->
+<!--ENDHTML-->
+<!--PREFIX <ARG ></ARG>-->
+<!--CUT DEF section 1 -->
+<BR>
+<BR>
+
+
+<h1>
+<img border="0" src="../../c++boost.gif" align="center" width="277" height="86">enable_if</h1>
+<BR>
+<BR>
+Copyright 2003 Jaakko J&auml;rvi, Jeremiah Willcock, Andrew Lumsdaine.<BR>
+<BR>
+<!--TOC section Introduction-->
+
+<H2><A NAME="htoc1">1</A>&nbsp;&nbsp;Introduction</H2><!--SEC END -->
+
+<A NAME="introduction"></A>
+The <TT>enable_if</TT> family of templates is a set of tools to allow a function template or a class template specialization 
+to include or exclude itself from a set of matching functions or specializations
+based on properties of its template arguments. 
+For example, one can define function templates that
+are only enabled for, and thus only match, an arbitrary set of types
+defined by a traits class. The <TT>enable_if</TT> templates can also be
+applied to enable class template specializations. Applications of
+<TT>enable_if</TT> are discussed in length
+in&nbsp;[<A HREF="#jarvi:03:cuj_arbitrary_overloading"><CITE>1</CITE></A>] and&nbsp;[<A HREF="#jarvi:03:c++typeclasses"><CITE>2</CITE></A>].<BR>
+<BR>
+<!--TOC subsection Synopsis-->
+
+<H3><A NAME="htoc2">1.1</A>&nbsp;&nbsp;Synopsis</H3><!--SEC END -->
+
+<A NAME="sec:synopsis"></A>
+<PRE>namespace boost {
+  template &lt;class Cond, class T = void&gt; struct enable_if;
+  template &lt;class Cond, class T = void&gt; struct disable_if;
+  template &lt;class Cond, class T&gt; struct lazy_enable_if;
+  template &lt;class Cond, class T&gt; struct lazy_disable_if;
+
+  template &lt;bool B, class T = void&gt; struct enable_if_c;
+  template &lt;bool B, class T = void&gt; struct disable_if_c;
+  template &lt;bool B, class T&gt; struct lazy_enable_if_c;
+  template &lt;bool B, class T&gt; struct lazy_disable_if_c;
+}
+</PRE>
+<!--TOC subsection Background-->
+
+<H3><A NAME="htoc3">1.2</A>&nbsp;&nbsp;Background</H3><!--SEC END -->
+
+<A NAME="sec:background"></A>
+Sensible operation of template function overloading in C++ relies
+on the <EM>SFINAE</EM> (substitution-failure-is-not-an-error)
+principle&nbsp;[<A HREF="#vandevoorde2002:templates"><CITE>3</CITE></A>]: if an invalid argument
+or return type is formed during the instantiation of a function
+template, the instantiation is removed from the overload resolution
+set instead of causing a compilation error. The following example, 
+taken from&nbsp;[<A HREF="#jarvi:03:cuj_arbitrary_overloading"><CITE>1</CITE></A>],
+demonstrates why this is important:
+<PRE>int negate(int i) { return -i; }
+
+template &lt;class F&gt;
+typename F::result_type negate(const F&amp; f) { return -f(); }
+
+</PRE>
+Suppose the compiler encounters the call <TT>negate(1)</TT>. The first
+definition is obviously a better match, but the compiler must
+nevertheless consider (and instantiate the prototypes) of both
+definitions to find this out. Instantiating the latter definition with
+<TT>F</TT> as <TT>int</TT> would result in:
+<PRE>int::result_type negate(const int&amp;);
+
+</PRE>
+where the return type is invalid. If this was an error, adding an unrelated function template 
+(that was never called) could break otherwise valid code.
+Due to the SFINAE principle the above example is not, however, erroneous. 
+The latter definition of <TT>negate</TT> is simply removed from the overload resolution set.<BR>
+<BR>
+The <TT>enable_if</TT> templates are tools for controlled creation of the SFINAE
+conditions.<BR>
+<BR>
+<!--TOC section The <TT>enable_if</TT> templates-->
+
+<H2><A NAME="htoc4">2</A>&nbsp;&nbsp;The <TT>enable_if</TT> templates</H2><!--SEC END -->
+
+<A NAME="enable_if"></A>
+The names of the <TT>enable_if</TT> templates have three parts: an optional <TT>lazy_</TT> tag, 
+either <TT>enable_if</TT> or <TT>disable_if</TT>, and an optional <TT>_c</TT> tag.
+All eight combinations of these parts are supported.
+The meaning of the <TT>lazy_</TT> tag is described in Section&nbsp;<A HREF="#sec:enable_if_lazy">3.3</A>.
+The second part of the name indicates whether a true condition argument should 
+enable or disable the current overload.
+The third part of the name indicates whether the condition argument is a <TT>bool</TT> value 
+(<TT>_c</TT> suffix), or a type containing a static <TT>bool</TT> constant named <TT>value</TT> (no suffix).
+The latter version interoperates with Boost.MPL. <BR>
+<BR>
+The definitions of <TT>enable_if_c</TT> and <TT>enable_if</TT> are as follows (we use <TT>enable_if</TT> templates 
+unqualified but they are in the <TT>boost</TT> namespace).
+<PRE>template &lt;bool B, class T = void&gt;
+struct enable_if_c {
+  typedef T type;
+};
+
+template &lt;class T&gt;
+struct enable_if_c&lt;false, T&gt; {};
+
+template &lt;class Cond, class T = void&gt;
+struct enable_if : public enable_if_c&lt;Cond::value, T&gt; {};
+
+</PRE>
+An instantiation of the <TT>enable_if_c</TT> template with the parameter
+<TT>B</TT> as <TT>true</TT> contains a member type <TT>type</TT>, defined
+to be <TT>T</TT>. If <TT>B</TT> is
+<TT>false</TT>, no such member is defined. Thus 
+<TT>enable_if_c&lt;B, T&gt;::type</TT> is either a valid or an invalid type
+expression, depending on the value of <TT>B</TT>.
+When valid, <TT>enable_if_c&lt;B, T&gt;::type</TT> equals <TT>T</TT>.
+The <TT>enable_if_c</TT> template can thus be used for controlling when functions are considered for
+overload resolution and when they are not. 
+For example, the following function is defined for all arithmetic types (according to the
+classification of the <A HREF="http://www.boost.org/libs/type_traits">Boost type_traits library</A>):
+<PRE>template &lt;class T&gt;
+typename enable_if_c&lt;boost::is_arithmetic&lt;T&gt;::value, T&gt;::type 
+foo(T t) { return t; }
+
+</PRE>
+The <TT>disable_if_c</TT> template is provided as well, and has the
+same functionality as <TT>enable_if_c</TT> except for the negated condition. The following
+function is enabled for all non-arithmetic types.
+<PRE>template &lt;class T&gt;
+typename disable_if_c&lt;boost::is_arithmetic&lt;T&gt;::value, T&gt;::type 
+bar(T t) { return t; }
+
+</PRE>
+For easier syntax in some cases and interoperation with Boost.MPL we provide versions of
+the <TT>enable_if</TT> templates taking any type with a <TT>bool</TT> member constant named 
+<TT>value</TT> as the condition argument.
+The MPL <TT>bool_</TT>, <TT>and_</TT>, <TT>or_</TT>, and <TT>not_</TT> templates are likely to be 
+useful for creating such types. Also, the traits classes in the Boost.Type_traits library 
+follow this convention. 
+For example, the above example function <TT>foo</TT> can be alternatively written as:
+<PRE>template &lt;class T&gt;
+typename enable_if&lt;boost::is_arithmetic&lt;T&gt;, T&gt;::type 
+foo(T t) { return t; }
+
+</PRE>
+<!--TOC section Using <TT>enable_if</TT>-->
+
+<H2><A NAME="htoc5">3</A>&nbsp;&nbsp;Using <TT>enable_if</TT></H2><!--SEC END -->
+
+<A NAME="sec:using_enable_if"></A>
+The <TT>enable_if</TT> templates are defined in
+<TT>boost/utility/enable_if.hpp</TT>, which is included by <TT>boost/utility.hpp</TT>.<BR>
+<BR>
+The <TT>enable_if</TT> template can be used either as the return type, or as an 
+extra argument. For example, the <TT>foo</TT> function in the previous section could also be written
+as:
+<PRE>template &lt;class T&gt;
+T foo(T t, typename enable_if&lt;boost::is_arithmetic&lt;T&gt; &gt;::type* dummy = 0); 
+
+</PRE>Hence, an extra parameter of type <TT>void*</TT> is added, but it is given 
+a default value to keep the parameter hidden from client code.
+Note that the second template argument was not given to <TT>enable_if</TT>, as the default 
+<TT>void</TT> gives the desired behavior.<BR>
+<BR>
+Whether to write the enabler as an argument or within the return type is
+largely a matter of taste, but for certain functions, only one
+alternative is possible:
+<UL><LI>
+Operators have a fixed number of arguments, thus <TT>enable_if</TT> must be used in the return type.
+<LI>Constructors and destructors do not have a return type; an extra argument is the only option.
+<LI>There does not seem to be a way to specify an enabler for a conversion operator. Converting constructors,
+however, can have enablers as extra default arguments.
+</UL>
+<!--TOC subsection Enabling template class specializations-->
+
+<H3><A NAME="htoc6">3.1</A>&nbsp;&nbsp;Enabling template class specializations</H3><!--SEC END -->
+
+<A NAME="sec:enable_if_classes"></A>
+Class template specializations can be enabled or disabled with <TT>enable_if</TT>.
+One extra template parameter needs to be added for the enabler expressions.
+This parameter has the default value <TT>void</TT>.
+For example:
+<PRE>template &lt;class T, class Enable = void&gt; 
+class A { ... };
+
+template &lt;class T&gt;
+class A&lt;T, typename enable_if&lt;is_integral&lt;T&gt; &gt;::type&gt; { ... };
+
+template &lt;class T&gt;
+class A&lt;T, typename enable_if&lt;is_float&lt;T&gt; &gt;::type&gt; { ... };
+
+</PRE>Instantiating <TT>A</TT> with any integral type matches the first specialization,
+whereas any floating point type matches the second one. All other types
+match the primary template.
+The condition can be any compile-time boolean expression that depends on the 
+template arguments of the class.
+Note that again, the second argument to <TT>enable_if</TT> is not needed; the default (<TT>void</TT>) 
+is the correct value.<BR>
+<BR>
+<!--TOC subsection Overlapping enabler conditions-->
+
+<H3><A NAME="htoc7">3.2</A>&nbsp;&nbsp;Overlapping enabler conditions</H3><!--SEC END -->
+
+<A NAME="sec:overlapping_conditions"></A>
+Once the compiler has examined the enabling conditions and included the
+function into the overload resolution set, normal C++ overload resolution 
+rules are used to select the best matching function.
+In particular, there is no ordering between enabling conditions.
+Function templates with enabling conditions that are not mutually exclusive can 
+lead to ambiguities. For example:
+<PRE>template &lt;class T&gt;
+typename enable_if&lt;boost::is_integral&lt;T&gt;, void&gt;::type 
+foo(T t) {}
+
+template &lt;class T&gt;
+typename enable_if&lt;boost::is_arithmetic&lt;T&gt;, void&gt;::type 
+foo(T t) {}
+
+</PRE>
+All integral types are also arithmetic. Therefore, say, for the call <TT>foo(1)</TT>,
+both conditions are true and both functions are thus in the overload resolution set.
+They are both equally good matches and thus ambiguous.
+Of course, more than one enabling condition can be simultaneously true as long as 
+other arguments disambiguate the functions.<BR>
+<BR>
+The above discussion applies to using <TT>enable_if</TT> in class template
+partial specializations as well.<BR>
+<BR>
+<!--TOC subsection Lazy <TT>enable_if</TT>-->
+
+<H3><A NAME="htoc8">3.3</A>&nbsp;&nbsp;Lazy <TT>enable_if</TT></H3><!--SEC END -->
+
+<A NAME="sec:enable_if_lazy"></A>
+In some cases it is necessary to avoid instantiating part of a
+function signature unless an enabling condition is true. For example:
+<PRE>template &lt;class T, class U&gt; class mult_traits;
+
+template &lt;class T, class U&gt;
+typename enable_if&lt;is_multipliable&lt;T, U&gt;, typename mult_traits&lt;T, U&gt;::type&gt;::type
+operator*(const T&amp; t, const U&amp; u) { ... }
+
+</PRE>Assume the class template <TT>mult_traits</TT> is a traits class defining 
+the resulting type of a multiplication operator. The <TT>is_multipliable</TT> traits
+class specifies for which types to enable the operator. Whenever
+<TT>is_multipliable&lt;A, B&gt;::value</TT> is <TT>true</TT> for some types <TT>A</TT> and <TT>B</TT>,
+then <TT>mult_traits&lt;A, B&gt;::type</TT> is defined.<BR>
+<BR>
+Now, trying to invoke (some other overload) of <TT>operator*</TT> with, say, operand types <TT>C</TT> and <TT>D</TT> 
+for which <TT>is_multipliable&lt;C, D&gt;::value</TT> is <TT>false</TT> 
+and <TT>mult_traits&lt;C, D&gt;::type</TT> is not defined is an error on some compilers. 
+The SFINAE principle is not applied because
+the invalid type occurs as an argument to another template. The <TT>lazy_enable_if</TT> 
+and <TT>lazy_disable_if</TT> templates (and their <TT>_c</TT> versions) can be used in such
+situations:
+<PRE>template&lt;class T, class U&gt;
+typename lazy_enable_if&lt;is_multipliable&lt;T, U&gt;, mult_traits&lt;T, U&gt; &gt;::type
+operator*(const T&amp; t, const U&amp; u) { ... }
+
+</PRE>The second argument of <TT>lazy_enable_if</TT> must be a class type
+that defines a nested type named <TT>type</TT> whenever the first
+parameter (the condition) is true.<BR>
+<BR>
+<!--TOC paragraph Note-->
+
+<H5>Note</H5><!--SEC END -->
+
+Referring to one member type or static constant in a traits class
+causes all of the members (type and static constant) of that
+specialization to be instantiated. Therefore, if your traits classes
+can sometimes contain invalid types, you should use two distinct
+templates for describing the conditions and the type mappings. In the
+above example, <TT>is_multipliable&lt;T, U&gt;::value</TT> defines when
+<TT>mult_traits&lt;T, U&gt;::type</TT> is valid.<BR>
+<BR>
+<!--TOC subsection Compiler workarounds-->
+
+<H3><A NAME="htoc9">3.4</A>&nbsp;&nbsp;Compiler workarounds</H3><!--SEC END -->
+
+<A NAME="sec:workarounds"></A>
+Some compilers flag functions as ambiguous if the only distinguishing factor is a different 
+condition in an enabler (even though the functions could never be ambiguous). For example,
+some compilers (e.g. GCC 3.2) diagnose the following two functions as ambiguous:
+<PRE>template &lt;class T&gt;
+typename enable_if&lt;boost::is_arithmetic&lt;T&gt;, T&gt;::type 
+foo(T t);
+
+template &lt;class T&gt;
+typename disable_if&lt;boost::is_arithmetic&lt;T&gt;, T&gt;::type 
+foo(T t);
+
+</PRE>Two workarounds can be applied:
+<UL><LI>
+Use an extra dummy parameter which disambiguates the functions. Use a default value for
+it to hide the parameter from the caller. For example:
+<PRE>template &lt;class T&gt; struct dummy { dummy(int) {} };
+
+template &lt;class T&gt;
+typename enable_if&lt;boost::is_arithmetic&lt;T&gt;, T&gt;::type 
+foo(T t, dummy&lt;0&gt; = 0);
+
+template &lt;class T&gt;
+typename disable_if&lt;boost::is_arithmetic&lt;T&gt;, T&gt;::type 
+foo(T t, dummy&lt;1&gt; = 0);
+</PRE><BR>
+<BR>
+<LI>Define the functions in different namespaces and bring them into a common
+namespace with <TT>using</TT> declarations:
+<PRE>namespace A {
+  template &lt;class T&gt;
+  typename enable_if&lt;boost::is_arithmetic&lt;T&gt;, T&gt;::type 
+  foo(T t);
+}
+
+namespace B {
+  template &lt;class T&gt;
+  typename disable_if&lt;boost::is_arithmetic&lt;T&gt;, T&gt;::type 
+  foo(T t);
+}
+
+using A::foo;
+using B::foo;
+
+</PRE>
+Note that the second workaround above cannot be used for member
+templates. On the other hand, operators do not accept extra arguments,
+which makes the first workaround unusable. As the net effect,
+neither of the workarounds are of assistance for templated operators that
+need to be defined as member functions (assignment and
+subscript operators).
+</UL>
+<!--TOC section Acknowledgements-->
+
+<H2><A NAME="htoc10">4</A>&nbsp;&nbsp;Acknowledgements</H2><!--SEC END -->
+
+We are grateful to Howard Hinnant, Jason Shirk, Paul Mensonides, and Richard
+Smith whose findings have influenced the library.<BR>
+<BR>
+<!--TOC section References-->
+
+<H2>References</H2><!--SEC END -->
+<DL COMPACT=compact><DT><A NAME="jarvi:03:cuj_arbitrary_overloading"><FONT COLOR=purple>[1]</FONT></A><DD>
+Jaakko J&auml;rvi, Jeremiah Willcock, Howard Hinnant, and Andrew Lumsdaine.
+Function overloading based on arbitrary properties of types.
+<EM>C/C++ Users Journal</EM>, 21(6):25--32, June 2003.<BR>
+<BR>
+<DT><A NAME="jarvi:03:c++typeclasses"><FONT COLOR=purple>[2]</FONT></A><DD>
+Jaakko J&auml;rvi, Jeremiah Willcock, and Andrew Lumsdaine.
+Concept-controlled polymorphism.
+In Frank Pfennig and Yannis Smaragdakis, editors, <EM>Generative
+ Programming and Component Engineering</EM>, volume 2830 of <EM>LNCS</EM>, pages
+ 228--244. Springer Verlag, September 2003.<BR>
+<BR>
+<DT><A NAME="vandevoorde2002:templates"><FONT COLOR=purple>[3]</FONT></A><DD>
+David Vandevoorde and Nicolai&nbsp;M. Josuttis.
+<EM>C++ Templates: The Complete Guide</EM>.
+Addison-Wesley, 2002.</DL>
+
+
+
+
+
+<hr></hr>
+
+<B>Contributed by:</B> <BR>
+Jaakko J&auml;rvi, Jeremiah Willcock and Andrew Lumsdaine<BR>
+<EM>{jajarvi|jewillco|lums}@osl.iu.edu</EM><BR>
+Indiana University<BR>
+Open Systems Lab
+<!--HTMLFOOT-->
+<!--ENDHTML-->
+<!--FOOTER-->
+<HR SIZE=2>
+<BLOCKQUOTE><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
+</EM><A HREF="http://pauillac.inria.fr/~maranget/hevea/index.html"><EM>H<FONT SIZE=2><sup>E</sup></FONT>V<FONT SIZE=2><sup>E</sup></FONT>A</EM></A><EM>.
+</EM></BLOCKQUOTE>
+</BODY>
+</HTML>
--- a/enable_if_constructors.cpp
+++ b/enable_if_constructors.cpp
@ -0,0 +1,62 @@
+// Boost enable_if library
+
+// Copyright 2003 <20> The Trustees of Indiana University.
+
+// 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)
+
+//    Authors: Jaakko J<>rvi (jajarvi at osl.iu.edu)
+//             Jeremiah Willcock (jewillco at osl.iu.edu)
+//             Andrew Lumsdaine (lums at osl.iu.edu)
+
+#include <boost/test/minimal.hpp>
+
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits.hpp>
+
+using boost::enable_if;
+using boost::disable_if;
+using boost::is_arithmetic;
+
+struct container {
+  bool my_value;
+
+  template <class T>
+  container(const T&, const typename enable_if<is_arithmetic<T>, T>::type * = 0):
+  my_value(true) {}
+
+  template <class T>
+  container(const T&, const typename disable_if<is_arithmetic<T>, T>::type * = 0):
+  my_value(false) {}
+};
+
+// example from Howard Hinnant (tests enable_if template members of a templated class)
+template <class charT>
+struct xstring
+{
+  template <class It>
+  xstring(It begin, It end, typename 
+          disable_if<is_arithmetic<It> >::type* = 0)
+    : data(end-begin) {}
+  
+  int data;
+};
+
+
+int test_main(int, char*[])
+{
+ 
+  BOOST_CHECK(container(1).my_value);
+  BOOST_CHECK(container(1.0).my_value);
+
+  BOOST_CHECK(!container("1").my_value);  
+  BOOST_CHECK(!container(static_cast<void*>(0)).my_value);  
+
+  char sa[] = "123456";
+  BOOST_CHECK(xstring<char>(sa, sa+6).data == 6);
+
+
+  return 0;
+}
+
--- a/enable_if_dummy_arg_disambiguation.cpp
+++ b/enable_if_dummy_arg_disambiguation.cpp
@ -0,0 +1,46 @@
+// Boost enable_if library
+
+// Copyright 2003 <20> The Trustees of Indiana University.
+
+// 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)
+
+//    Authors: Jaakko J<>rvi (jajarvi at osl.iu.edu)
+//             Jeremiah Willcock (jewillco at osl.iu.edu)
+//             Andrew Lumsdaine (lums at osl.iu.edu)
+
+#include <boost/test/minimal.hpp>
+
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_arithmetic.hpp>
+
+using boost::enable_if;
+using boost::disable_if;
+using boost::is_arithmetic;
+
+template <int N> struct dummy {
+  dummy(int) {};
+};
+
+template<class T>
+typename enable_if<is_arithmetic<T>, bool>::type
+arithmetic_object(T t, dummy<0> = 0) { return true; }
+
+template<class T>
+typename disable_if<is_arithmetic<T>, bool>::type
+arithmetic_object(T t, dummy<1> = 0) { return false; }
+
+
+int test_main(int, char*[])
+{
+ 
+  BOOST_CHECK(arithmetic_object(1));
+  BOOST_CHECK(arithmetic_object(1.0));
+
+  BOOST_CHECK(!arithmetic_object("1"));  
+  BOOST_CHECK(!arithmetic_object(static_cast<void*>(0)));  
+
+  return 0;
+}
+
--- a/enable_if_lazy.cpp
+++ b/enable_if_lazy.cpp
@ -0,0 +1,82 @@
+// Boost enable_if library
+
+// Copyright 2003 <20> The Trustees of Indiana University.
+
+// 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)
+
+//    Authors: Jaakko J<>rvi (jajarvi at osl.iu.edu)
+//             Jeremiah Willcock (jewillco at osl.iu.edu)
+//             Andrew Lumsdaine (lums at osl.iu.edu)
+
+#include <boost/test/minimal.hpp>
+
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_same.hpp>
+
+using boost::enable_if_c;
+using boost::lazy_enable_if_c;
+
+// This class provides a reduced example of a traits class for
+// computing the result of multiplying two types.  The member typedef
+// 'type' in this traits class defines the return type of this
+// operator.  The return type member is invalid unless both arguments
+// for mult_traits are values that mult_traits expects (ints in this
+// case).  This kind of situation may arise if a traits class only
+// makes sense for some set of types, not all C++ types.
+
+template <class T> struct is_int {
+  BOOST_STATIC_CONSTANT(bool, value = (boost::is_same<T, int>::value));
+};
+
+template <class T, class U>
+struct mult_traits {
+  typedef typename T::does_not_exist type;
+};
+
+template <>
+struct mult_traits<int, int> {
+  typedef int type;
+};
+
+
+// Next, a forwarding function mult() is defined.  It is enabled only
+// when both arguments are of type int.  The first version, using
+// non-lazy enable_if_c does not work.
+
+#if 0
+template <class T, class U>
+typename enable_if_c<
+  is_int<T>::value && is_int<U>::value,
+  typename mult_traits<T, U>::type
+>::type
+mult(const T& x, const U& y) {return x * y;}
+#endif
+
+// A correct version uses lazy_enable_if_c.
+// This template removes compiler errors from invalid code used as an
+// argument to enable_if_c.
+
+#if 1
+template <class T, class U>
+typename lazy_enable_if_c<
+  is_int<T>::value && is_int<U>::value,
+  mult_traits<T, U> 
+>::type
+mult(const T& x, const U& y) {return x * y;}
+#endif
+
+double mult(int i, double d) { return (double)i * d; }
+
+int test_main(int, char*[])
+{
+
+
+  BOOST_CHECK(mult(1, 2) == 2);
+
+  BOOST_CHECK(mult(1, 3.0) == 3.0);
+
+  return 0;
+}
+
--- a/enable_if_lazy_test.cpp
+++ b/enable_if_lazy_test.cpp
@ -0,0 +1,100 @@
+// Boost enable_if library
+
+// Copyright 2003 <20> The Trustees of Indiana University.
+
+// 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)
+
+//    Authors: Jaakko J<>rvi (jajarvi at osl.iu.edu)
+//             Jeremiah Willcock (jewillco at osl.iu.edu)
+//             Andrew Lumsdaine (lums at osl.iu.edu)
+
+// Testing all variations of lazy_enable_if.
+
+#include <boost/test/minimal.hpp>
+#include <boost/mpl/not.hpp>
+
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_same.hpp>
+
+using boost::lazy_enable_if;
+using boost::lazy_disable_if;
+
+using boost::lazy_enable_if_c;
+using boost::lazy_disable_if_c;
+
+
+template <class T>
+struct is_int_or_double {
+  BOOST_STATIC_CONSTANT(bool, 
+    value = (boost::is_same<T, int>::value || 
+             boost::is_same<T, double>::value));
+};
+
+template <class T>
+struct some_traits {
+  typedef typename T::does_not_exist type;
+};
+
+template <>
+struct some_traits<int> {
+  typedef bool type;
+};
+
+template <>
+struct some_traits<double> {
+  typedef bool type;
+};
+
+template <class T>
+struct make_bool {
+  typedef bool type;
+};
+
+template <>
+struct make_bool<int> {};
+
+template <>
+struct make_bool<double> {};
+
+namespace A {
+
+  template<class T>
+  typename lazy_enable_if<is_int_or_double<T>, some_traits<T> >::type
+  foo(T t) { return true; }
+
+  template<class T>
+  typename lazy_enable_if_c<is_int_or_double<T>::value, some_traits<T> >::type
+  foo2(T t) { return true; }
+}
+
+namespace B {
+  template<class T>
+  typename lazy_disable_if<is_int_or_double<T>, make_bool<T> >::type
+  foo(T t) { return false; }
+
+  template<class T>
+  typename lazy_disable_if_c<is_int_or_double<T>::value, make_bool<T> >::type
+  foo2(T t) { return false; }
+}
+
+int test_main(int, char*[])
+{
+  using namespace A;
+  using namespace B;
+  BOOST_CHECK(foo(1));
+  BOOST_CHECK(foo(1.0));
+
+  BOOST_CHECK(!foo("1"));  
+  BOOST_CHECK(!foo(static_cast<void*>(0)));  
+
+  BOOST_CHECK(foo2(1));
+  BOOST_CHECK(foo2(1.0));
+
+  BOOST_CHECK(!foo2("1"));  
+  BOOST_CHECK(!foo2(static_cast<void*>(0)));  
+
+  return 0;
+}
+
--- a/enable_if_member_templates.cpp
+++ b/enable_if_member_templates.cpp
@ -0,0 +1,43 @@
+// Boost enable_if library
+
+// Copyright 2003 <20> The Trustees of Indiana University.
+
+// 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)
+
+//    Authors: Jaakko J<>rvi (jajarvi at osl.iu.edu)
+//             Jeremiah Willcock (jewillco at osl.iu.edu)
+//             Andrew Lumsdaine (lums at osl.iu.edu)
+
+#include <boost/test/minimal.hpp>
+
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_arithmetic.hpp>
+
+using boost::enable_if;
+using boost::disable_if;
+using boost::is_arithmetic;
+
+struct container {
+  template <class T>
+  typename enable_if<is_arithmetic<T>, bool>::type
+  arithmetic_object(const T&, const int* /* disambiguate */ = 0) {return true;}
+
+  template <class T>
+  typename disable_if<is_arithmetic<T>, bool>::type
+  arithmetic_object(const T&) {return false;}
+};
+
+int test_main(int, char*[])
+{
+ 
+  BOOST_CHECK(container().arithmetic_object(1));
+  BOOST_CHECK(container().arithmetic_object(1.0));
+
+  BOOST_CHECK(!container().arithmetic_object("1"));  
+  BOOST_CHECK(!container().arithmetic_object(static_cast<void*>(0)));  
+
+  return 0;
+}
+
--- a/enable_if_namespace_disambiguation.cpp
+++ b/enable_if_namespace_disambiguation.cpp
@ -0,0 +1,47 @@
+// Boost enable_if library
+
+// Copyright 2003 <20> The Trustees of Indiana University.
+
+// 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)
+
+//    Authors: Jaakko J<>rvi (jajarvi at osl.iu.edu)
+//             Jeremiah Willcock (jewillco at osl.iu.edu)
+//             Andrew Lumsdaine (lums at osl.iu.edu)
+
+#include <boost/test/minimal.hpp>
+#include <boost/mpl/not.hpp>
+
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_arithmetic.hpp>
+
+using boost::enable_if;
+using boost::mpl::not_;
+using boost::is_arithmetic;
+
+namespace A {
+  template<class T>
+  typename enable_if<is_arithmetic<T>, bool>::type
+  arithmetic_object(T t) { return true; }
+}
+
+namespace B {
+  template<class T>
+  typename enable_if<not_<is_arithmetic<T> >, bool>::type
+  arithmetic_object(T t) { return false; }
+}
+
+int test_main(int, char*[])
+{
+  using namespace A;
+  using namespace B;
+  BOOST_CHECK(arithmetic_object(1));
+  BOOST_CHECK(arithmetic_object(1.0));
+
+  BOOST_CHECK(!arithmetic_object("1"));  
+  BOOST_CHECK(!arithmetic_object(static_cast<void*>(0)));  
+
+  return 0;
+}
+
--- a/enable_if_no_disambiguation.cpp
+++ b/enable_if_no_disambiguation.cpp
@ -0,0 +1,43 @@
+// Boost enable_if library
+
+// Copyright 2003 <20> The Trustees of Indiana University.
+
+// 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)
+
+//    Authors: Jaakko J<>rvi (jajarvi at osl.iu.edu)
+//             Jeremiah Willcock (jewillco at osl.iu.edu)
+//             Andrew Lumsdaine (lums at osl.iu.edu)
+
+#include <boost/test/minimal.hpp>
+#include <boost/mpl/not.hpp>
+
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_arithmetic.hpp>
+
+using boost::mpl::not_;
+using boost::enable_if;
+using boost::is_arithmetic;
+
+template<class T>
+typename enable_if<is_arithmetic<T>, bool>::type
+arithmetic_object(T t) { return true; }
+
+template<class T>
+typename enable_if<not_<is_arithmetic<T> >, bool>::type
+arithmetic_object(T t) { return false; }
+
+
+int test_main(int, char*[])
+{
+ 
+  BOOST_CHECK(arithmetic_object(1));
+  BOOST_CHECK(arithmetic_object(1.0));
+
+  BOOST_CHECK(!arithmetic_object("1"));  
+  BOOST_CHECK(!arithmetic_object(static_cast<void*>(0)));  
+
+  return 0;
+}
+
--- a/enable_if_partial_specializations.cpp
+++ b/enable_if_partial_specializations.cpp
@ -0,0 +1,67 @@
+// Boost enable_if library
+
+// Copyright 2003 <20> The Trustees of Indiana University.
+
+// 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)
+
+//    Authors: Jaakko J<>rvi (jajarvi at osl.iu.edu)
+//             Jeremiah Willcock (jewillco at osl.iu.edu)
+//             Andrew Lumsdaine (lums at osl.iu.edu)
+
+#include <boost/test/minimal.hpp>
+
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_arithmetic.hpp>
+
+using boost::enable_if_c;
+using boost::disable_if_c;
+using boost::enable_if;
+using boost::disable_if;
+using boost::is_arithmetic;
+
+template <class T, class Enable = void>
+struct tester;
+
+template <class T>
+struct tester<T, typename enable_if_c<is_arithmetic<T>::value>::type> {
+  BOOST_STATIC_CONSTANT(bool, value = true);
+};
+
+template <class T>
+struct tester<T, typename disable_if_c<is_arithmetic<T>::value>::type> {
+  BOOST_STATIC_CONSTANT(bool, value = false);
+};
+
+template <class T, class Enable = void>
+struct tester2;
+
+template <class T>
+struct tester2<T, typename enable_if<is_arithmetic<T> >::type> {
+  BOOST_STATIC_CONSTANT(bool, value = true);
+};
+
+template <class T>
+struct tester2<T, typename disable_if<is_arithmetic<T> >::type> {
+  BOOST_STATIC_CONSTANT(bool, value = false);
+};
+
+int test_main(int, char*[])
+{
+ 
+  BOOST_CHECK(tester<int>::value);
+  BOOST_CHECK(tester<double>::value);
+
+  BOOST_CHECK(!tester<char*>::value);
+  BOOST_CHECK(!tester<void*>::value);
+
+  BOOST_CHECK(tester2<int>::value);
+  BOOST_CHECK(tester2<double>::value);
+
+  BOOST_CHECK(!tester2<char*>::value);
+  BOOST_CHECK(!tester2<void*>::value);
+
+  return 0;
+}
+
--- a/filter_iterator.htm
+++ b/filter_iterator.htm
@ -1,273 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Filter Iterator Adaptor Documentation</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-<img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)"
-align="center" width="277" height="86">
-
-<h1>Filter Iterator Adaptor</h1>
-
-Defined in header
-<a href="../../boost/iterator_adaptors.hpp">boost/iterator_adaptors.hpp</a>
-
-
-<p>
-The filter iterator adaptor creates a view of an iterator range in
-which some elements of the range are skipped over. A <a
-href="http://www.sgi.com/tech/stl/Predicate.html">Predicate</a>
-function object controls which elements are skipped. When the
-predicate is applied to an element, if it returns <tt>true</tt> then
-the element is retained and if it returns <tt>false</tt> then the
-element is skipped over.
-
-
-<h2>Synopsis</h2>
-
-<pre>
-namespace boost {
-  template &lt;class Predicate, class BaseIterator, ...&gt;
-  class filter_iterator_generator;
-
-  template &lt;class Predicate, class BaseIterator&gt;
-  typename filter_iterator_generator&lt;Predicate, BaseIterator&gt;::type
-  make_filter_iterator(BaseIterator first, BaseIterator last, const Predicate& p = Predicate());
-}
-</pre>
-
-<hr>
-
-<h2><a name="filter_iterator_generator">The Filter Iterator Type
-Generator</a></h2>
-
-The class <tt>filter_iterator_generator</tt> is a helper class whose
-purpose is to construct a filter iterator type.  The template
-parameters for this class are the <tt>Predicate</tt> function object
-type and the <tt>BaseIterator</tt> type that is being wrapped.  In
-most cases the associated types for the wrapped iterator can be
-deduced from <tt>std::iterator_traits</tt>, but in some situations the
-user may want to override these types, so there are also template
-parameters for each of the iterator's associated types.
-
-<pre>
-template &lt;class Predicate, class BaseIterator,
-          class Value, class Reference, class Pointer, class Category, class Distance>
-class filter_iterator_generator
-{
-public:
-  typedef <tt><a href="./iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt...&gt;</tt> type; // the resulting filter iterator type 
-}
-</pre>
-
-
-<h3>Example</h3>
-
-The following example uses filter iterator to print out all the
-positive integers in an array. 
-
-<pre>
-struct is_positive_number {
-  bool operator()(int x) { return 0 &lt; x; }
-};
-int main() {
-  int numbers[] = { 0, -1, 4, -3, 5, 8, -2 };
-  const int N = sizeof(numbers)/sizeof(int);
-
-  typedef boost::filter_iterator_generator&lt;is_positive_number, int*, int&gt;::type FilterIter;
-  is_positive_number predicate;
-  FilterIter::policies_type policies(predicate, numbers + N);
-  FilterIter filter_iter_first(numbers, policies);
-  FilterIter filter_iter_last(numbers + N, policies);
-
-  std::copy(filter_iter_first, filter_iter_last, std::ostream_iterator&lt;int&gt;(std::cout, " "));
-  std::cout &lt;&lt; std::endl;
-  return 0;
-}
-</pre>
-The output is:
-<pre>
-4 5 8
-</pre>
-
-
-<h3>Template Parameters</h3>
-
-<Table border>
-<TR>
-<TH>Parameter</TH><TH>Description</TH>
-</TR>
-
-<TR>
-<TD><a href="http://www.sgi.com/tech/stl/Predicate.html"><tt>Predicate</tt></a></TD>
-<TD>The function object that determines which elements are retained and which elements are skipped.
-</TR>
-
-<TR>
-<TD><tt>BaseIterator</tt></TD>
-<TD>The iterator type being wrapped. This type must at least be a model
- of the <a href="http://www.sgi.com/tech/stl/InputIterator">InputIterator</a> concept.</TD>
-</TR>
-
-<TR>
-<TD><tt>Value</tt></TD>
-<TD>The <tt>value_type</tt> of the resulting iterator,
-unless const. If const, a conforming compiler strips constness for the
-<tt>value_type</tt>. Typically the default for this parameter is the
-appropriate type<a href="#1">[1]</a>.<br> <b>Default:</b>
-<tt>std::iterator_traits&lt;BaseIterator&gt;::value_type</TD>
-</TR>
-
-<TR>
-<TD><tt>Reference</tt></TD>
-<TD>The <tt>reference</tt> type of the resulting iterator, and in
-particular, the result type of <tt>operator*()</tt>. Typically the default for
-this parameter is the appropriate type.<br> <b>Default:</b> If
-<tt>Value</tt> is supplied, <tt>Value&amp;</tt> is used. Otherwise
-<tt>std::iterator_traits&lt;BaseIterator&gt;::reference</tt> is
-used.</TD>
-</TR>
-
-<TR>
-<TD><tt>Pointer</tt></TD>
-<TD>The <tt>pointer</tt> type of the resulting iterator, and in
- particular, the result type of <tt>operator->()</tt>. 
- Typically the default for
-this parameter is the appropriate type.<br>
-<b>Default:</b> If <tt>Value</tt> was supplied, then <tt>Value*</tt>,
-otherwise <tt>std::iterator_traits&lt;BaseIterator&gt;::pointer</tt>.</TD>
-</TR>
-
-
-<TR>
-<TD><tt>Category</tt></TD>
-<TD>The <tt>iterator_category</tt> type for the resulting iterator.
-Typically the
-default for this parameter is the appropriate type. If you override
-this parameter, do not use <tt>bidirectional_iterator_tag</tt>
-because filter iterators can not go in reverse.<br>
-<b>Default:</b> <tt>std::iterator_traits&lt;BaseIterator&gt;::iterator_category</tt></TD>
-</TR>
-
-<TR>
-<TD><tt>Distance</tt></TD>
-<TD>The <tt>difference_type</tt> for the resulting iterator. Typically the default for
-this parameter is the appropriate type.<br>
-<b>Default:</b> <tt>std::iterator_traits&lt;BaseIterator&gt;::difference_type</TD>
-</TR>
-
-</table>
-
-
-<h3>Model of</h3>
-
-The filter iterator adaptor (the type
-<tt>filter_iterator_generator<...>::type</tt>) may be a model of <a
-href="http://www.sgi.com/tech/stl/InputIterator.html">InputIterator</a> or <a
-href="http://www.sgi.com/tech/stl/ForwardIterator.html">ForwardIterator</a>
-depending on the adapted iterator type.
-
-
-<h3>Members</h3>
-
-The filter iterator type implements all of the member functions and
-operators required of the <a
-href="http://www.sgi.com/tech/stl/ForwardIterator.html">ForwardIterator</a>
-concept.  In addition it has the following constructor:
-
-<pre>filter_iterator_generator::type(const BaseIterator& it, const Policies& p = Policies())</pre>
-
-<p>
-The policies type has only one public function, which is its constructor:
-
-<pre>filter_iterator_generator::policies_type(const Predicate& p, const BaseIterator& end)</pre>
-
-<p>
-<hr>
-<p>
-
-<h2><a name="make_filter_iterator">The Make Filter Iterator Function</a></h2>
-
-<pre>
-template &lt;class Predicate, class BaseIterator&gt;
-typename filter_generator&lt;Predicate, BaseIterator&gt;::type
-make_filter_iterator(BaseIterator first, BaseIterator last, const Predicate& p = Predicate())
-</pre>
-
-This function provides a convenient way to create filter iterators.
-
-<h3>Example</h3>
-
-In this example we print out all numbers in the array that are
-greater than negative two.
-
-<pre>
-int main()
-{
-  int numbers[] = { 0, -1, 4, -3, 5, 8, -2 };
-  const int N = sizeof(numbers)/sizeof(int);
-
-  std::copy(boost::make_filter_iterator(numbers, numbers + N, 
-					std::bind2nd(std::greater<int>(), -2)),
-	    boost::make_filter_iterator(numbers + N, numbers + N, 
-					std::bind2nd(std::greater<int>(), -2)),
-	    std::ostream_iterator<int>(std::cout, " "));
-  std::cout << std::endl;
-
-}
-</pre>
-The output is:
-<pre>
-0 -1 4 5 8 
-</pre>
-
-<p>
-In the next example we print the positive numbers using the
-<tt>make_filter_iterator()</tt> function.
-
-<pre>
-struct is_positive_number {
-  bool operator()(int x) { return 0 &lt; x; }
-};
-int main()
-{
-  int numbers[] = { 0, -1, 4, -3, 5, 8, -2 };
-  const int N = sizeof(numbers)/sizeof(int);
-
-  std::copy(boost::make_filter_iterator&lt;is_positive_number&gt;(numbers, numbers + N),
-	    boost::make_filter_iterator&lt;is_positive_number&gt;(numbers + N, numbers + N),
-	    std::ostream_iterator&lt;int&gt;(std::cout, " "));
-  std::cout &lt;&lt; std::endl;
-  return 0;
-}
-</pre>
-The output is:
-<pre>
-4 5 8
-</pre>
-
-
-<h3>Notes</h3>
-
-<a name="1">[1]</a> If the compiler does not support partial
-specialization and the wrapped iterator type is a builtin pointer then
-the <tt>Value</tt> type must be explicitly specified (don't use the
-default).
-
-
-<hr>
-<p>Revised <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->09 Mar 2001<!--webbot bot="Timestamp" endspan i-checksum="14894" --></p>
-<p><EFBFBD> Copyright Jeremy Siek 2000. Permission to copy, use,
-modify, sell and distribute this document is granted provided this copyright
-notice appears in all copies. This document is provided &quot;as is&quot;
-without express or implied warranty, and with no claim as to its suitability for
-any purpose.</p>
-
-</body>
-
-</html>
--- a/filter_iterator_example.cpp
+++ b/filter_iterator_example.cpp
@ -11,7 +11,7 @@
 #include <algorithm>
 #include <functional>
 #include <iostream>
-#include <boost/iterator_adaptors.hpp>
+#include <boost/iterator/filter_iterator.hpp>

 struct is_positive_number {
  bool operator()(int x) { return 0 < x; }
@ -22,13 +22,7 @@ int main()
  int numbers_[] = { 0, -1, 4, -3, 5, 8, -2 };
  const int N = sizeof(numbers_)/sizeof(int);
  
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-  // Assume there won't be proper iterator traits for pointers. This
-  // is just a wrapper for int* which has the right traits.
-  typedef boost::iterator_adaptor<int*, boost::default_iterator_policies, int> base_iterator;
-#else
  typedef int* base_iterator;
-#endif
  base_iterator numbers(numbers_);
  
  // Example using make_filter_iterator()
@ -37,23 +31,30 @@ int main()
            std::ostream_iterator<int>(std::cout, " "));
  std::cout << std::endl;

-  // Example using filter_iterator_generator
-  typedef boost::filter_iterator_generator<is_positive_number, base_iterator, int>::type
+  // Example using filter_iterator
+  typedef boost::filter_iterator<is_positive_number, base_iterator>
    FilterIter;
+  
  is_positive_number predicate;
-  FilterIter::policies_type policies(predicate, numbers + N);
-  FilterIter filter_iter_first(numbers, policies);
-  FilterIter filter_iter_last(numbers + N, policies);
+  FilterIter filter_iter_first(predicate, numbers, numbers + N);
+  FilterIter filter_iter_last(predicate, numbers + N, numbers + N);

  std::copy(filter_iter_first, filter_iter_last, std::ostream_iterator<int>(std::cout, " "));
  std::cout << std::endl;

  // Another example using make_filter_iterator()
-  std::copy(boost::make_filter_iterator(numbers, numbers + N, 
-                                        std::bind2nd(std::greater<int>(), -2)),
-            boost::make_filter_iterator(numbers + N, numbers + N, 
-                                        std::bind2nd(std::greater<int>(), -2)),
-            std::ostream_iterator<int>(std::cout, " "));
+  std::copy(
+      boost::make_filter_iterator(
+          std::bind2nd(std::greater<int>(), -2)
+        , numbers, numbers + N)
+            
+    , boost::make_filter_iterator(
+          std::bind2nd(std::greater<int>(), -2)
+        , numbers + N, numbers + N)
+      
+    , std::ostream_iterator<int>(std::cout, " ")
+  );
+  
  std::cout << std::endl;
  
  
--- a/fun_out_iter_example.cpp
+++ b/fun_out_iter_example.cpp
@ -15,12 +15,18 @@

 #include <boost/function_output_iterator.hpp>

-struct string_appender {
-  string_appender(std::string& s) : m_str(s) { }
-  void operator()(const std::string& x) const {
-    m_str += x;
-  }
-  std::string& m_str;
+struct string_appender
+{
+    string_appender(std::string& s)
+        : m_str(&s)
+    {}
+    
+    void operator()(const std::string& x) const
+    {
+        *m_str += x;
+    }
+
+    std::string* m_str;
 };

 int main(int, char*[])
--- a/function_output_iterator.htm
+++ b/function_output_iterator.htm
@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<html>
-<head>
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-    <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-    <meta name="ProgId" content="FrontPage.Editor.Document">
-
-    <title>Function Output Iterator Adaptor Documentation</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-        
-    <img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" align=
-    "center" width="277" height="86"> 
-
-    <h1>Function Output Iterator Adaptor</h1>
-    Defined in header <a href=
-    "../../boost/function_output_iterator.hpp">boost/function_output_iterator.hpp</a> 
-
-    <p>The function output iterator adaptor makes it easier to create
-    custom output iterators. The adaptor takes a <a
-    href="http://www.sgi.com/tech/stl/UnaryFunction.html">Unary
-    Function</a> and creates a model of <a
-    href="http://www.sgi.com/tech/stl/OutputIterator.html">Output
-    Iterator</a>. Each item assigned to the output iterator is passed
-    as an argument to the unary function.  The motivation for this
-    iterator is that creating a C++ Standard conforming output
-    iterator is non-trivial, particularly because the proper
-    implementation usually requires a proxy object. On the other hand,
-    creating a function (or function object) is much simpler.
-
-    <h2>Synopsis</h2>
-
-    <blockquote>
-<pre>
-namespace boost {
-  template &lt;class UnaryFunction&gt;
-  class function_output_iterator;
-
-  template &lt;class UnaryFunction&gt;
-  function_output_iterator&lt;UnaryFunction&gt;
-  make_function_output_iterator(const UnaryFunction&amp; f = UnaryFunction())
-}
-</pre>
-    </blockquote>
-
-    <h3>Example</h3>
-    
-    In this example we create an output iterator that appends
-    each item onto the end of a string, using the <tt>string_appender</tt>
-    function. 
-
-    <blockquote>
-<pre>
-#include &lt;iostream&gt;
-#include &lt;string&gt;
-#include &lt;vector&gt;
-
-#include &lt;boost/function_output_iterator.hpp&gt;
-
-struct string_appender {
-  string_appender(std::string&amp; s) : m_str(s) { }
-  void operator()(const std::string&amp; x) const {
-    m_str += x;
-  }
-  std::string&amp; m_str;
-};
-
-int main(int, char*[])
-{
-  std::vector&lt;std::string&gt; x;
-  x.push_back("hello");
-  x.push_back(" ");
-  x.push_back("world");
-  x.push_back("!");
-
-  std::string s = "";
-  std::copy(x.begin(), x.end(), 
-            boost::make_function_output_iterator(string_appender(s)));
-  
-  std::cout &lt;&lt; s &lt;&lt; std::endl;
-
-  return 0;
-}
-</pre>
-    </blockquote>
-
-    <hr>
-
-    <h2><a name="function_output_iterator">The Function Output Iterator Class</a></h2>
-
-    <blockquote>
-<pre>
-template &lt;class UnaryFunction&gt;
-class function_output_iterator;
-</pre>
-    </blockquote>
-
-    The <tt>function_output_iterator</tt> class creates an <a
-    href="http://www.sgi.com/tech/stl/OutputIterator.html">Output
-    Iterator</a> out of a
-    <a href="http://www.sgi.com/tech/stl/UnaryFunction.html">Unary
-    Function</a>. Each item assigned to the output iterator is passed
-    as an argument to the unary function.
-
-    <h3>Template Parameters</h3>
-
-    <table border>
-      <tr>
-        <th>Parameter
-
-        <th>Description
-
-      <tr>
-        <td><tt>UnaryFunction</tt> 
-
-        <td>The function type being wrapped. The return type of the
-        function is not used, so it can be <tt>void</tt>.  The
-        function must be a model of <a
-        href="http://www.sgi.com/tech/stl/UnaryFunction.html">Unary
-        Function</a>.</td>
-    </table>
-
-    <h3>Concept Model</h3>
-    The function output iterator class is a model of <a
-    href="http://www.sgi.com/tech/stl/OutputIterator.html">Output
-    Iterator</a>.
-
-    <h2>Members</h3>
-    The function output iterator implements the member functions
-    and operators required of the <a
-    href="http://www.sgi.com/tech/stl/OutputIterator.html">Output
-    Iterator</a> concept. In addition it has the following constructor:
-<pre>
-explicit function_output_iterator(const UnaryFunction& f = UnaryFunction())
-</pre>
-   <br>    
-    <br>
-
-    <hr>
-    <h2><a name="make_function_output_iterator">The Function Output Iterator Object
-    Generator</a></h2>
-
-    The <tt>make_function_output_iterator()</tt> function provides a
-    more convenient way to create function output iterator objects. The
-    function saves the user the trouble of explicitly writing out the
-    iterator types. If the default argument is used, the function
-    type must be provided as an explicit template argument.
-
-    <blockquote>
-<pre>
-template &lt;class UnaryFunction&gt;
-function_output_iterator&lt;UnaryFunction&gt;
-make_function_output_iterator(const UnaryFunction&amp; f = UnaryFunction())
-</pre>
-    </blockquote>
-
-    <hr>
-
-    <p>&copy; Copyright Jeremy Siek 2001. Permission to copy, use,
-    modify, sell and distribute this document is granted provided this
-    copyright notice appears in all copies. This document is provided
-    "as is" without express or implied warranty, and with no claim as
-    to its suitability for any purpose.
-
-</body>
-</html>
--- a/generator_iterator.htm
+++ b/generator_iterator.htm
@ -105,7 +105,7 @@ types.
 <pre>
 template &lt;class Generator&gt;
 typename generator_iterator_generator&lt;Generator&gt;::type
-make_function_output_iterator(Generator &amp; gen);
+make_generator_iterator(Generator &amp; gen);
 </pre>
 </blockquote>

--- a/half_open_range_test.cpp
+++ b/half_open_range_test.cpp
@ -346,7 +346,7 @@ int main()
    test_integer<unsigned int>();
    test_integer<long>();
    test_integer<unsigned long>();
-#if defined(ULLONG_MAX) || defined(ULONG_LONG_MAX)
+#if defined(BOOST_HAS_LONG_LONG)
    test_integer<long long>();
    test_integer<unsigned long long>();
 #endif
--- a/include/boost/assert.hpp
+++ b/include/boost/assert.hpp
@ -1,12 +1,5 @@
-#ifndef BOOST_ASSERT_HPP_INCLUDED
-#define BOOST_ASSERT_HPP_INCLUDED
-
-#if _MSC_VER >= 1020
-#pragma once
-#endif
-
 //
-//  boost/assert.hpp
+//  boost/assert.hpp - BOOST_ASSERT(expr)
 //
 //  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
 //
@ -15,38 +8,31 @@
 //  This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //
-
+//  Note: There are no include guards. This is intentional.
 //
-//  When BOOST_DEBUG is not defined, it defaults to 0 (off)
-//  for compatibility with programs that do not expect asserts
-//  in the smart pointer class templates.
-//
-//  This default may be changed after an initial transition period.
+//  See http://www.boost.org/libs/utility/assert.html for documentation.
 //

-#ifndef BOOST_DEBUG
-#define BOOST_DEBUG 0
-#endif
+#undef BOOST_ASSERT

-#if BOOST_DEBUG
+#if defined(BOOST_DISABLE_ASSERTS)

-#include <assert.h>
+# define BOOST_ASSERT(expr) ((void)0)

-#ifndef BOOST_ASSERT
+#elif defined(BOOST_ENABLE_ASSERT_HANDLER)

 #include <boost/current_function.hpp>

-bool boost_error(char const * expr, char const * func, char const * file, long line);
+namespace boost
+{

-# define BOOST_ASSERT(expr) ((expr) || !boost_error(#expr, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__) || (assert(expr), true))
+void assertion_failed(char const * expr, char const * function, char const * file, long line); // user defined

-#endif // #ifndef BOOST_ASSERT
+} // namespace boost

-#else // #if BOOST_DEBUG
+#define BOOST_ASSERT(expr) ((expr)? ((void)0): ::boost::assertion_failed(#expr, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))

-#undef BOOST_ASSERT
-#define BOOST_ASSERT(expr) ((void)0)
-
-#endif // #if BOOST_DEBUG
-
-#endif // #ifndef BOOST_ASSERT_HPP_INCLUDED
+#else
+# include <assert.h>
+# define BOOST_ASSERT(expr) assert(expr)
+#endif
--- a/include/boost/call_traits.hpp
+++ b/include/boost/call_traits.hpp
@ -1,9 +1,10 @@
-//  (C) Copyright Boost.org 2000. 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.
+//  (C) Copyright Steve Cleary, Beman Dawes, Howard Hinnant & John Maddock 2000.
+//  Use, modification and distribution are 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).
+//
+//  See http://www.boost.org/libs/utility for most recent version including documentation.

-//  See http://www.boost.org for most recent version including documentation.
 //  See boost/detail/call_traits.hpp and boost/detail/ob_call_traits.hpp
 //  for full copyright notices.

--- a/include/boost/checked_delete.hpp
+++ b/include/boost/checked_delete.hpp
@ -1,35 +1,45 @@
 #ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED
 #define BOOST_CHECKED_DELETE_HPP_INCLUDED

-#if _MSC_VER >= 1020
-#pragma once
+// MS compatible compilers support #pragma once
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
 #endif

 //
 //  boost/checked_delete.hpp
 //
 //  Copyright (c) 1999, 2000, 2001, 2002 boost.org
+//  Copyright (c) 2002, 2003 Peter Dimov
+//  Copyright (c) 2003 Daniel Frey
+//  Copyright (c) 2003 Howard Hinnant
 //
 //  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.
 //
+//  See http://www.boost.org/libs/utility/checked_delete.html for documentation.
+//

 namespace boost
 {

 // verify that types are complete for increased safety

-template< typename T > inline void checked_delete(T * x)
+template<class T> inline void checked_delete(T * x)
 {
-    typedef char type_must_be_complete[sizeof(T)];
+    // intentionally complex - simplification causes regressions
+    typedef char type_must_be_complete[ sizeof(T)? 1: -1 ];
+    (void) sizeof(type_must_be_complete);
    delete x;
 }

-template< typename T > inline void checked_array_delete(T * x)
+template<class T> inline void checked_array_delete(T * x)
 {
-    typedef char type_must_be_complete[sizeof(T)];
+    typedef char type_must_be_complete[ sizeof(T)? 1: -1 ];
+    (void) sizeof(type_must_be_complete);
    delete [] x;
 }

@ -38,9 +48,10 @@ template<class T> struct checked_deleter
    typedef void result_type;
    typedef T * argument_type;

-    void operator()(T * x)
+    void operator()(T * x) const
    {
-        checked_delete(x);
+        // boost:: disables ADL
+        boost::checked_delete(x);
    }
 };

@ -49,9 +60,9 @@ template<class T> struct checked_array_deleter
    typedef void result_type;
    typedef T * argument_type;

-    void operator()(T * x)
+    void operator()(T * x) const
    {
-        checked_array_delete(x);
+        boost::checked_array_delete(x);
    }
 };

--- a/include/boost/compressed_pair.hpp
+++ b/include/boost/compressed_pair.hpp
@ -1,9 +1,10 @@
-//  (C) Copyright Boost.org 2000. 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.
+//  (C) Copyright Steve Cleary, Beman Dawes, Howard Hinnant & John Maddock 2000.
+//  Use, modification and distribution are 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).
+//
+//  See http://www.boost.org/libs/utility for most recent version including documentation.

-//  See http://www.boost.org for most recent version including documentation.
 //  See boost/detail/compressed_pair.hpp and boost/detail/ob_compressed_pair.hpp
 //  for full copyright notices.

--- a/include/boost/current_function.hpp
+++ b/include/boost/current_function.hpp
@ -1,8 +1,10 @@
 #ifndef BOOST_CURRENT_FUNCTION_HPP_INCLUDED
 #define BOOST_CURRENT_FUNCTION_HPP_INCLUDED

-#if _MSC_VER >= 1020
-#pragma once
+// MS compatible compilers support #pragma once
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
 #endif

 //
@ -15,6 +17,8 @@
 //  This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //
+//  http://www.boost.org/libs/utility/current_function.html
+//

 namespace boost
 {
@ -25,7 +29,7 @@ namespace detail
 inline void current_function_helper()
 {

-#if defined(__GNUC__)
+#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600))

 # define BOOST_CURRENT_FUNCTION __PRETTY_FUNCTION__

@ -33,7 +37,11 @@ inline void current_function_helper()

 # define BOOST_CURRENT_FUNCTION __FUNCSIG__

-#elif defined(__BORLANDC__)
+#elif (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 600)) || (defined(__IBMCPP__) && (__IBMCPP__ >= 500))
+
+# define BOOST_CURRENT_FUNCTION __FUNCTION__
+
+#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x550)

 # define BOOST_CURRENT_FUNCTION __FUNC__

--- a/include/boost/detail/call_traits.hpp
+++ b/include/boost/detail/call_traits.hpp
@ -1,10 +1,9 @@
 //  (C) Copyright Steve Cleary, Beman Dawes, Howard Hinnant & John Maddock 2000.
-//  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.
-
-//  See http://www.boost.org for most recent version including documentation.
+//  Use, modification and distribution are 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).
+//
+//  See http://www.boost.org/libs/utility for most recent version including documentation.

 // call_traits: defines typedefs for function usage
 // (see libs/utility/call_traits.htm)
@ -22,13 +21,10 @@
 #ifndef BOOST_CONFIG_HPP
 #include <boost/config.hpp>
 #endif
+#include <cstddef>

-#ifndef BOOST_ARITHMETIC_TYPE_TRAITS_HPP
-#include <boost/type_traits/arithmetic_traits.hpp>
-#endif
-#ifndef BOOST_COMPOSITE_TYPE_TRAITS_HPP
-#include <boost/type_traits/composite_traits.hpp>
-#endif
+#include <boost/type_traits/is_arithmetic.hpp>
+#include <boost/type_traits/is_pointer.hpp>

 namespace boost{

@ -95,7 +91,7 @@ struct call_traits<T&>
   typedef T& param_type;  // hh removed const
 };

-#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x551)
+#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x560)
 // these are illegal specialisations; cv-qualifies applied to
 // references have no effect according to [8.3.2p1],
 // C++ Builder requires them though as it treats cv-qualified
@ -125,7 +121,7 @@ struct call_traits<T&const volatile>
   typedef T& param_type;  // hh removed const
 };
 #endif
-#ifndef __SUNPRO_CC
+#if !defined(BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS)
 template <typename T, std::size_t N>
 struct call_traits<T [N]>
 {
--- a/include/boost/detail/compressed_pair.hpp
+++ b/include/boost/detail/compressed_pair.hpp
@ -1,14 +1,16 @@
 //  (C) Copyright Steve Cleary, Beman Dawes, Howard Hinnant & John Maddock 2000.
-//  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.
-
-//  See http://www.boost.org for most recent version including documentation.
+//  Use, modification and distribution are 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).
+//
+//  See http://www.boost.org/libs/utility for most recent version including documentation.

 // compressed_pair: pair that "compresses" empty members
 // (see libs/utility/compressed_pair.htm)
 //
+// JM changes 25 Jan 2004:
+// For the case where T1 == T2 and both are empty, then first() and second()
+// should return different objects.
 // JM changes 25 Jan 2000:
 // Removed default arguments from compressed_pair_switch to get
 // C++ Builder 4 to accept them
@ -19,15 +21,11 @@
 #define BOOST_DETAIL_COMPRESSED_PAIR_HPP

 #include <algorithm>
-#ifndef BOOST_OBJECT_TYPE_TRAITS_HPP
-#include <boost/type_traits/object_traits.hpp>
-#endif
-#ifndef BOOST_SAME_TRAITS_HPP
-#include <boost/type_traits/same_traits.hpp>
-#endif
-#ifndef BOOST_CALL_TRAITS_HPP
+
+#include <boost/type_traits/remove_cv.hpp>
+#include <boost/type_traits/is_empty.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <boost/call_traits.hpp>
-#endif

 namespace boost
 {
@ -273,20 +271,21 @@ namespace details

      compressed_pair_imp() {}

-      compressed_pair_imp(first_param_type x, second_param_type)
-         : first_type(x) {}
+      compressed_pair_imp(first_param_type x, second_param_type y)
+         : first_type(x), m_second(y) {}

      compressed_pair_imp(first_param_type x)
-         : first_type(x) {}
+         : first_type(x), m_second(x) {}

      first_reference       first()       {return *this;}
      first_const_reference first() const {return *this;}

-      second_reference       second()       {return *this;}
-      second_const_reference second() const {return *this;}
+      second_reference       second()       {return m_second;}
+      second_const_reference second() const {return m_second;}

      void swap(::boost::compressed_pair<T1,T2>&) {}
   private:
+      T2 m_second;
   };

   // 5    T1 == T2 and are not empty:   //JM
--- a/include/boost/detail/ob_call_traits.hpp
+++ b/include/boost/detail/ob_call_traits.hpp
@ -1,10 +1,9 @@
 //  (C) Copyright Steve Cleary, Beman Dawes, Howard Hinnant & John Maddock 2000.
-//  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.
-
-//  See http://www.boost.org for most recent version including documentation.
+//  Use, modification and distribution are 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).
+//
+//  See http://www.boost.org/libs/utility for most recent version including documentation.
 //
 //  Crippled version for crippled compilers:
 //  see libs/utility/call_traits.htm
@ -98,21 +97,21 @@ struct call_traits_chooser<false, false, true>
 template <bool size_is_small> 
 struct call_traits_sizeof_chooser2
 {
-	template <class T>
-	struct small_rebind
-	{
-		typedef simple_call_traits<T> small_type;
-	};
+   template <class T>
+   struct small_rebind
+   {
+      typedef simple_call_traits<T> small_type;
+   };
 };

 template<> 
 struct call_traits_sizeof_chooser2<false>
 {
-	template <class T>
-	struct small_rebind
-	{
-		typedef standard_call_traits<T> small_type;
-	};
+   template <class T>
+   struct small_rebind
+   {
+      typedef standard_call_traits<T> small_type;
+   };
 };

 template <>
@ -121,10 +120,10 @@ struct call_traits_chooser<false, true, false>
   template <class T>
   struct rebind
   {
-	   enum { sizeof_choice = (sizeof(T) <= sizeof(void*)) };
-	   typedef call_traits_sizeof_chooser2<(sizeof(T) <= sizeof(void*))> chooser;
-	   typedef typename chooser::template small_rebind<T> bound_type;
-	   typedef typename bound_type::small_type type;
+      enum { sizeof_choice = (sizeof(T) <= sizeof(void*)) };
+      typedef call_traits_sizeof_chooser2<(sizeof(T) <= sizeof(void*))> chooser;
+      typedef typename chooser::template small_rebind<T> bound_type;
+      typedef typename bound_type::small_type type;
   };
 };

@ -138,8 +137,8 @@ private:
         ::boost::is_arithmetic<T>::value, 
         ::boost::is_reference<T>::value
      > chooser;
-	typedef typename chooser::template rebind<T> bound_type;
-	typedef typename bound_type::type call_traits_type;
+   typedef typename chooser::template rebind<T> bound_type;
+   typedef typename bound_type::type call_traits_type;
 public:
   typedef typename call_traits_type::value_type       value_type;
   typedef typename call_traits_type::reference        reference;
--- a/include/boost/detail/ob_compressed_pair.hpp
+++ b/include/boost/detail/ob_compressed_pair.hpp
@ -1,10 +1,9 @@
 //  (C) Copyright Steve Cleary, Beman Dawes, Howard Hinnant & John Maddock 2000.
-//  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.
-
-//  See http://www.boost.org for most recent version including documentation.
+//  Use, modification and distribution are 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).
+//
+//  See http://www.boost.org/libs/utility for most recent version including documentation.
 //  see libs/utility/compressed_pair.hpp
 //
 /* Release notes:
@ -168,7 +167,7 @@ public:
   compressed_pair_1(const ::boost::compressed_pair<T1,T2>& x)
      : T2(x.second()), _first(x.first()) {}

-#ifdef BOOST_MSVC
+#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
  // Total weirdness. If the assignment to _first is moved after
  // the call to the inherited operator=, then this breaks graph/test/graph.cpp
  // by way of iterator_adaptor.
@ -293,22 +292,24 @@ public:
   typedef typename call_traits<second_type>::const_reference second_const_reference;

            compressed_pair_4() : T1() {}
-            compressed_pair_4(first_param_type x, second_param_type) : T1(x) {}
+            compressed_pair_4(first_param_type x, second_param_type y) : T1(x), m_second(y) {}
   // only one single argument constructor since T1 == T2
-   explicit compressed_pair_4(first_param_type x) : T1(x) {}
+   explicit compressed_pair_4(first_param_type x) : T1(x), m_second(x) {}
   compressed_pair_4(const ::boost::compressed_pair<T1,T2>& x)
-      : T1(x.first()){}
+      : T1(x.first()), m_second(x.second()) {}

   first_reference       first()       { return *this; }
   first_const_reference first() const { return *this; }

-   second_reference       second()       { return *this; }
-   second_const_reference second() const { return *this; }
+   second_reference       second()       { return m_second; }
+   second_const_reference second() const { return m_second; }

   void swap(compressed_pair_4& y)
   {
      // no need to swap empty base classes:
   }
+private:
+   T2 m_second;
 };

 // T1 == T2, not empty
--- a/include/boost/generator_iterator.hpp
+++ b/include/boost/generator_iterator.hpp
@ -9,60 +9,68 @@
 // 15 Nov 2001   Jens Maurer
 //      created.

+//  See http://www.boost.org/libs/utility/iterator_adaptors.htm for documentation.
+
 #ifndef BOOST_ITERATOR_ADAPTOR_GENERATOR_ITERATOR_HPP
 #define BOOST_ITERATOR_ADAPTOR_GENERATOR_ITERATOR_HPP

-#include <boost/iterator_adaptors.hpp>
+#include <boost/iterator/iterator_facade.hpp>
 #include <boost/ref.hpp>

 namespace boost {

 template<class Generator>
-class generator_iterator_policies
+class generator_iterator
+  : public iterator_facade<
+        generator_iterator<Generator>
+      , typename Generator::result_type
+      , single_pass_traversal_tag
+      , typename Generator::result_type const&
+    >
 {
-public:
-    generator_iterator_policies() { }
+    typedef iterator_facade<
+        generator_iterator<Generator>
+      , typename Generator::result_type
+      , single_pass_traversal_tag
+      , typename Generator::result_type const&
+    > super_t;
+    
+ public:
+    generator_iterator() {}
+    generator_iterator(Generator* g) : m_g(g), m_value((*m_g)()) {}

-    template<class Base>
-    void initialize(Base& base) {
-      m_value = (*base)();
+    void increment()
+    {
+        m_value = (*m_g)();
    }

-    // The Iter template argument is necessary for compatibility with a MWCW
-    // bug workaround
-    template <class IteratorAdaptor>
-    void increment(IteratorAdaptor& iter) {
-      m_value = (*iter.base())();
-    }
-
-    template <class IteratorAdaptor>
    const typename Generator::result_type&
-    dereference(const IteratorAdaptor&) const
-        { return m_value; }
+    dereference() const
+    {
+        return m_value;
+    }

-    template <class IteratorAdaptor1, class IteratorAdaptor2>
-    bool equal(const IteratorAdaptor1& x, const IteratorAdaptor2& y) const
-        { return x.base() == y.base() &&
-            x.policies().m_value == y.policies().m_value; }
+    bool equal(generator_iterator const& y) const
+    {
+        return this->m_g == y.m_g && this->m_value == y.m_value;
+    }

-private:
-  typename Generator::result_type m_value;
+ private:
+    Generator* m_g;
+    typename Generator::result_type m_value;
 };

 template<class Generator>
 struct generator_iterator_generator
 {
-  typedef iterator_adaptor<Generator*, generator_iterator_policies<Generator>,
-    typename Generator::result_type, const typename Generator::result_type&,
-    const typename Generator::result_type*, std::input_iterator_tag,
-    long>       type;
+  typedef generator_iterator<Generator> type;
 };

 template <class Generator>
-inline typename generator_iterator_generator<Generator>::type
+inline generator_iterator<Generator>
 make_generator_iterator(Generator & gen)
 {
-  typedef typename generator_iterator_generator<Generator>::type result_t;
+  typedef generator_iterator<Generator> result_t;
  return result_t(&gen);
 }

--- a/include/boost/next_prior.hpp
+++ b/include/boost/next_prior.hpp
@ -0,0 +1,53 @@
+//  Boost next_prior.hpp header file  ---------------------------------------//
+
+//  (C) Copyright Boost.org 1999-2003. 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.
+
+//  See http://www.boost.org/libs/utility for documentation.
+
+//  Revision History
+//  13 Dec 2003  Added next(x, n) and prior(x, n) (Daniel Walker)
+
+#ifndef BOOST_NEXT_PRIOR_HPP_INCLUDED
+#define BOOST_NEXT_PRIOR_HPP_INCLUDED
+
+#include <iterator>
+
+namespace boost {
+
+//  Helper functions for classes like bidirectional iterators not supporting
+//  operator+ and operator-
+//
+//  Usage:
+//    const std::list<T>::iterator p = get_some_iterator();
+//    const std::list<T>::iterator prev = boost::prior(p);
+//    const std::list<T>::iterator next = boost::next(prev, 2);
+
+//  Contributed by Dave Abrahams
+
+template <class T>
+inline T next(T x) { return ++x; }
+
+template <class T, class Distance>
+inline T next(T x, Distance n)
+{
+    std::advance(x, n);
+    return x;
+}
+
+template <class T>
+inline T prior(T x) { return --x; }
+
+template <class T, class Distance>
+inline T prior(T x, Distance n)
+{
+    std::advance(x, -n);
+    return x;
+}
+
+} // namespace boost
+
+#endif  // BOOST_NEXT_PRIOR_HPP_INCLUDED
--- a/include/boost/noncopyable.hpp
+++ b/include/boost/noncopyable.hpp
@ -0,0 +1,33 @@
+//  Boost noncopyable.hpp header file  --------------------------------------//
+
+//  (C) Copyright Boost.org 1999-2003. 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.
+
+//  See http://www.boost.org/libs/utility for documentation.
+
+#ifndef BOOST_NONCOPYABLE_HPP_INCLUDED
+#define BOOST_NONCOPYABLE_HPP_INCLUDED
+
+namespace boost {
+
+//  Private copy constructor and copy assignment ensure classes derived from
+//  class noncopyable cannot be copied.
+
+//  Contributed by Dave Abrahams
+
+class noncopyable
+{
+ protected:
+    noncopyable() {}
+    ~noncopyable() {}
+ private:  // emphasize the following members are private
+    noncopyable( const noncopyable& );
+    const noncopyable& operator=( const noncopyable& );
+};
+
+} // namespace boost
+
+#endif  // BOOST_NONCOPYABLE_HPP_INCLUDED
--- a/include/boost/operators.hpp
+++ b/include/boost/operators.hpp
@ -6,9 +6,12 @@
 //  software is provided "as is" without express or implied warranty, and
 //  with no claim as to its suitability for any purpose.

-//  See http://www.boost.org for most recent version including documentation.
+//  See http://www.boost.org/libs/utility/operators.htm for documentation.

 //  Revision History
+//  21 Oct 02 Modified implementation of operators to allow compilers with a
+//            correct named return value optimization (NRVO) to produce optimal
+//            code.  (Daniel Frey)
 //  02 Dec 01 Bug fixed in random_access_iteratable.  (Helmut Zeisel)
 //  28 Sep 01 Factored out iterator operator groups.  (Daryle Walker)
 //  27 Aug 01 'left' form for non commutative operators added;
@ -75,9 +78,10 @@

 #include <boost/config.hpp>
 #include <boost/iterator.hpp>
+#include <boost/detail/workaround.hpp>

 #if defined(__sgi) && !defined(__GNUC__)
-#pragma set woff 1234
+#   pragma set woff 1234
 #endif

 #if defined(BOOST_MSVC)
@ -149,127 +153,112 @@ struct equality_comparable1 : B
     friend bool operator!=(const T& x, const T& y) { return !(x == y); }
 };

-template <class T, class U, class B = ::boost::detail::empty_base>
-struct multipliable2 : B
-{
-     friend T operator*(T x, const U& y) { return x *= y; }
-     friend T operator*(const U& y, T x) { return x *= y; }
+// A macro which produces "name_2left" from "name".
+#define BOOST_OPERATOR2_LEFT(name) name##2##_##left
+
+//  NRVO-friendly implementation (contributed by Daniel Frey) ---------------//
+
+#if defined(BOOST_HAS_NRVO) || defined(BOOST_FORCE_SYMMETRIC_OPERATORS)
+
+// This is the optimal implementation for ISO/ANSI C++,
+// but it requires the compiler to implement the NRVO.
+// If the compiler has no NRVO, this is the best symmetric
+// implementation available.
+
+#define BOOST_BINARY_OPERATOR_COMMUTATIVE( NAME, OP )                         \
+template <class T, class U, class B = ::boost::detail::empty_base>            \
+struct NAME##2 : B                                                            \
+{                                                                             \
+  friend T operator OP( const T& lhs, const U& rhs )                          \
+    { T nrv( lhs ); nrv OP##= rhs; return nrv; }                              \
+  friend T operator OP( const U& lhs, const T& rhs )                          \
+    { T nrv( rhs ); nrv OP##= lhs; return nrv; }                              \
+};                                                                            \
+                                                                              \
+template <class T, class B = ::boost::detail::empty_base>                     \
+struct NAME##1 : B                                                            \
+{                                                                             \
+  friend T operator OP( const T& lhs, const T& rhs )                          \
+    { T nrv( lhs ); nrv OP##= rhs; return nrv; }                              \
 };

-template <class T, class B = ::boost::detail::empty_base>
-struct multipliable1 : B
-{
-     friend T operator*(T x, const T& y) { return x *= y; }
+#define BOOST_BINARY_OPERATOR_NON_COMMUTATIVE( NAME, OP )           \
+template <class T, class U, class B = ::boost::detail::empty_base>  \
+struct NAME##2 : B                                                  \
+{                                                                   \
+  friend T operator OP( const T& lhs, const U& rhs )                \
+    { T nrv( lhs ); nrv OP##= rhs; return nrv; }                    \
+};                                                                  \
+                                                                    \
+template <class T, class U, class B = ::boost::detail::empty_base>  \
+struct BOOST_OPERATOR2_LEFT(NAME) : B                               \
+{                                                                   \
+  friend T operator OP( const U& lhs, const T& rhs )                \
+    { T nrv( lhs ); nrv OP##= rhs; return nrv; }                    \
+};                                                                  \
+                                                                    \
+template <class T, class B = ::boost::detail::empty_base>           \
+struct NAME##1 : B                                                  \
+{                                                                   \
+  friend T operator OP( const T& lhs, const T& rhs )                \
+    { T nrv( lhs ); nrv OP##= rhs; return nrv; }                    \
 };

-template <class T, class U, class B = ::boost::detail::empty_base>
-struct addable2 : B
-{
-     friend T operator+(T x, const U& y) { return x += y; }
-     friend T operator+(const U& y, T x) { return x += y; }
+#else // defined(BOOST_HAS_NRVO) || defined(BOOST_FORCE_SYMMETRIC_OPERATORS)
+
+// For compilers without NRVO the following code is optimal, but not
+// symmetric!  Note that the implementation of
+// BOOST_OPERATOR2_LEFT(NAME) only looks cool, but doesn't provide
+// optimization opportunities to the compiler :)
+
+#define BOOST_BINARY_OPERATOR_COMMUTATIVE( NAME, OP )                         \
+template <class T, class U, class B = ::boost::detail::empty_base>            \
+struct NAME##2 : B                                                            \
+{                                                                             \
+  friend T operator OP( T lhs, const U& rhs ) { return lhs OP##= rhs; }       \
+  friend T operator OP( const U& lhs, T rhs ) { return rhs OP##= lhs; }       \
+};                                                                            \
+                                                                              \
+template <class T, class B = ::boost::detail::empty_base>                     \
+struct NAME##1 : B                                                            \
+{                                                                             \
+  friend T operator OP( T lhs, const T& rhs ) { return lhs OP##= rhs; }       \
 };

-template <class T, class B = ::boost::detail::empty_base>
-struct addable1 : B
-{
-     friend T operator+(T x, const T& y) { return x += y; }
+#define BOOST_BINARY_OPERATOR_NON_COMMUTATIVE( NAME, OP )               \
+template <class T, class U, class B = ::boost::detail::empty_base>      \
+struct NAME##2 : B                                                      \
+{                                                                       \
+  friend T operator OP( T lhs, const U& rhs ) { return lhs OP##= rhs; } \
+};                                                                      \
+                                                                        \
+template <class T, class U, class B = ::boost::detail::empty_base>      \
+struct BOOST_OPERATOR2_LEFT(NAME) : B                                   \
+{                                                                       \
+  friend T operator OP( const U& lhs, const T& rhs )                    \
+    { return T( lhs ) OP##= rhs; }                                      \
+};                                                                      \
+                                                                        \
+template <class T, class B = ::boost::detail::empty_base>               \
+struct NAME##1 : B                                                      \
+{                                                                       \
+  friend T operator OP( T lhs, const T& rhs ) { return lhs OP##= rhs; } \
 };

-template <class T, class U, class B = ::boost::detail::empty_base>
-struct subtractable2 : B
-{
-     friend T operator-(T x, const U& y) { return x -= y; }
-};
+#endif // defined(BOOST_HAS_NRVO) || defined(BOOST_FORCE_SYMMETRIC_OPERATORS)

-template <class T, class U, class B = ::boost::detail::empty_base>
-struct subtractable2_left : B
-{
-  friend T operator-(const U& x, const T& y)
-    { T result(x); return result -= y; }
-};
+BOOST_BINARY_OPERATOR_COMMUTATIVE( multipliable, * )
+BOOST_BINARY_OPERATOR_COMMUTATIVE( addable, + )
+BOOST_BINARY_OPERATOR_NON_COMMUTATIVE( subtractable, - )
+BOOST_BINARY_OPERATOR_NON_COMMUTATIVE( dividable, / )
+BOOST_BINARY_OPERATOR_NON_COMMUTATIVE( modable, % )
+BOOST_BINARY_OPERATOR_COMMUTATIVE( xorable, ^ )
+BOOST_BINARY_OPERATOR_COMMUTATIVE( andable, & )
+BOOST_BINARY_OPERATOR_COMMUTATIVE( orable, | )

-template <class T, class B = ::boost::detail::empty_base>
-struct subtractable1 : B
-{
-     friend T operator-(T x, const T& y) { return x -= y; }
-};
-
-template <class T, class U, class B = ::boost::detail::empty_base>
-struct dividable2 : B
-{
-     friend T operator/(T x, const U& y) { return x /= y; }
-};
-
-template <class T, class U, class B = ::boost::detail::empty_base>
-struct dividable2_left : B
-{
-  friend T operator/(const U& x, const T& y)
-    { T result(x); return result /= y; }
-};
-
-template <class T, class B = ::boost::detail::empty_base>
-struct dividable1 : B
-{
-     friend T operator/(T x, const T& y) { return x /= y; }
-};
-
-template <class T, class U, class B = ::boost::detail::empty_base>
-struct modable2 : B
-{
-     friend T operator%(T x, const U& y) { return x %= y; }
-};
-
-template <class T, class U, class B = ::boost::detail::empty_base>
-struct modable2_left : B
-{
-  friend T operator%(const U& x, const T& y)
-    { T result(x); return result %= y; }
-};
-
-template <class T, class B = ::boost::detail::empty_base>
-struct modable1 : B
-{
-     friend T operator%(T x, const T& y) { return x %= y; }
-};
-
-template <class T, class U, class B = ::boost::detail::empty_base>
-struct xorable2 : B
-{
-     friend T operator^(T x, const U& y) { return x ^= y; }
-     friend T operator^(const U& y, T x) { return x ^= y; }
-};
-
-template <class T, class B = ::boost::detail::empty_base>
-struct xorable1 : B
-{
-     friend T operator^(T x, const T& y) { return x ^= y; }
-};
-
-template <class T, class U, class B = ::boost::detail::empty_base>
-struct andable2 : B
-{
-     friend T operator&(T x, const U& y) { return x &= y; }
-     friend T operator&(const U& y, T x) { return x &= y; }
-};
-
-template <class T, class B = ::boost::detail::empty_base>
-struct andable1 : B
-{
-     friend T operator&(T x, const T& y) { return x &= y; }
-};
-
-template <class T, class U, class B = ::boost::detail::empty_base>
-struct orable2 : B
-{
-     friend T operator|(T x, const U& y) { return x |= y; }
-     friend T operator|(const U& y, T x) { return x |= y; }
-};
-
-template <class T, class B = ::boost::detail::empty_base>
-struct orable1 : B
-{
-     friend T operator|(T x, const T& y) { return x |= y; }
-};
+#undef BOOST_BINARY_OPERATOR_COMMUTATIVE
+#undef BOOST_BINARY_OPERATOR_NON_COMMUTATIVE
+#undef BOOST_OPERATOR2_LEFT

 //  incrementable and decrementable contributed by Jeremy Siek

@ -278,9 +267,9 @@ struct incrementable : B
 {
  friend T operator++(T& x, int)
  {
-    incrementable_type tmp(x);
+    incrementable_type nrv(x);
    ++x;
-    return tmp;
+    return nrv;
  }
 private: // The use of this typedef works around a Borland bug
  typedef T incrementable_type;
@ -291,9 +280,9 @@ struct decrementable : B
 {
  friend T operator--(T& x, int)
  {
-    decrementable_type tmp(x);
+    decrementable_type nrv(x);
    --x;
-    return tmp;
+    return nrv;
  }
 private: // The use of this typedef works around a Borland bug
  typedef T decrementable_type;
@ -320,30 +309,46 @@ struct indexable : B
 };

 //  More operator classes (contributed by Daryle Walker) --------------------//
+//  (NRVO-friendly implementation contributed by Daniel Frey) ---------------//

-template <class T, class U, class B = ::boost::detail::empty_base>
-struct left_shiftable2 : B
-{
-     friend T operator<<(T x, const U& y) { return x <<= y; }
+#if defined(BOOST_HAS_NRVO) || defined(BOOST_FORCE_SYMMETRIC_OPERATORS)
+
+#define BOOST_BINARY_OPERATOR( NAME, OP )                                     \
+template <class T, class U, class B = ::boost::detail::empty_base>            \
+struct NAME##2 : B                                                            \
+{                                                                             \
+  friend T operator OP( const T& lhs, const U& rhs )                          \
+    { T nrv( lhs ); nrv OP##= rhs; return nrv; }                              \
+};                                                                            \
+                                                                              \
+template <class T, class B = ::boost::detail::empty_base>                     \
+struct NAME##1 : B                                                            \
+{                                                                             \
+  friend T operator OP( const T& lhs, const T& rhs )                          \
+    { T nrv( lhs ); nrv OP##= rhs; return nrv; }                              \
 };

-template <class T, class B = ::boost::detail::empty_base>
-struct left_shiftable1 : B
-{
-     friend T operator<<(T x, const T& y) { return x <<= y; }
+#else // defined(BOOST_HAS_NRVO) || defined(BOOST_FORCE_SYMMETRIC_OPERATORS)
+
+#define BOOST_BINARY_OPERATOR( NAME, OP )                                     \
+template <class T, class U, class B = ::boost::detail::empty_base>            \
+struct NAME##2 : B                                                            \
+{                                                                             \
+  friend T operator OP( T lhs, const U& rhs ) { return lhs OP##= rhs; }       \
+};                                                                            \
+                                                                              \
+template <class T, class B = ::boost::detail::empty_base>                     \
+struct NAME##1 : B                                                            \
+{                                                                             \
+  friend T operator OP( T lhs, const T& rhs ) { return lhs OP##= rhs; }       \
 };

-template <class T, class U, class B = ::boost::detail::empty_base>
-struct right_shiftable2 : B
-{
-     friend T operator>>(T x, const U& y) { return x >>= y; }
-};
+#endif // defined(BOOST_HAS_NRVO) || defined(BOOST_FORCE_SYMMETRIC_OPERATORS)

-template <class T, class B = ::boost::detail::empty_base>
-struct right_shiftable1 : B
-{
-     friend T operator>>(T x, const T& y) { return x >>= y; }
-};
+BOOST_BINARY_OPERATOR( left_shiftable, << )
+BOOST_BINARY_OPERATOR( right_shiftable, >> )
+
+#undef BOOST_BINARY_OPERATOR

 template <class T, class U, class B = ::boost::detail::empty_base>
 struct equivalent2 : B
--- a/include/boost/ref.hpp
+++ b/include/boost/ref.hpp
@ -1,17 +1,21 @@
 #ifndef BOOST_REF_HPP_INCLUDED
-# define BOOST_REF_HPP_INCLUDED
+#define BOOST_REF_HPP_INCLUDED

-# if _MSC_VER+0 >= 1020
-#  pragma once
-# endif
+// MS compatible compilers support #pragma once

-# include <boost/config.hpp>
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/config.hpp>
+#include <boost/utility/addressof.hpp>
+#include <boost/mpl/bool.hpp>

 //
 //  ref.hpp - ref/cref, useful helper functions
 //
 //  Copyright (C) 1999, 2000 Jaakko J<>rvi (jaakko.jarvi@cs.utu.fi)
-//  Copyright (C) 2001 Peter Dimov
+//  Copyright (C) 2001, 2002 Peter Dimov
 //  Copyright (C) 2002 David Abrahams
 //
 //  Permission to copy, use, modify, sell and distribute this software
@ -30,18 +34,28 @@ template<class T> class reference_wrapper
 public:
    typedef T type;

+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+
    explicit reference_wrapper(T& t): t_(&t) {}

+#else
+
+    explicit reference_wrapper(T& t): t_(boost::addressof(t)) {}
+
+#endif
+
    operator T& () const { return *t_; }

    T& get() const { return *t_; }

+    T* get_pointer() const { return t_; }
+
 private:

    T* t_;
 };

-# if defined(__BORLANDC__) && (__BORLANDC__ <= 0x551)
+# if defined(__BORLANDC__) && (__BORLANDC__ <= 0x570)
 #  define BOOST_REF_CONST
 # else
 #  define BOOST_REF_CONST const
@ -62,16 +76,14 @@ template<class T> inline reference_wrapper<T const> BOOST_REF_CONST cref(T const
 # ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 template<typename T>
 class is_reference_wrapper
+    : public mpl::false_
 {
- public:
-    BOOST_STATIC_CONSTANT(bool, value = false); 
 };

 template<typename T>
 class is_reference_wrapper<reference_wrapper<T> >
+    : public mpl::true_
 {
- public:
-    BOOST_STATIC_CONSTANT(bool, value = true);
 };

 template<typename T>
@ -133,8 +145,10 @@ class is_reference_wrapper
 public:
    BOOST_STATIC_CONSTANT(
        bool, value = (
-            sizeof(detail::is_reference_wrapper_test(type<T>()))
+             sizeof(detail::is_reference_wrapper_test(type<T>()))
            == sizeof(detail::yes_reference_wrapper_t)));
+    
+    typedef ::boost::mpl::bool_<value> type;
 };

 template <typename T>
--- a/include/boost/utility.hpp
+++ b/include/boost/utility.hpp
@ -1,62 +1,18 @@
-//  boost utility.hpp header file  -------------------------------------------//
+//  Boost utility.hpp header file  -------------------------------------------//

-//  (C) Copyright boost.org 1999. 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.
+//  Copyright 1999-2003 Boost.org.  Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0.  (See accompanying file
+//  LICENSE_1_0.txt or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)

-//  See http://www.boost.org for most recent version including documentation.
-
-//  Classes appear in alphabetical order
+//  See <http://www.boost.org/libs/utility/> for the library's home page.

 #ifndef BOOST_UTILITY_HPP
 #define BOOST_UTILITY_HPP

-// certain headers are part of the <utility.hpp> interface
-
-#include <boost/checked_delete.hpp>
+#include <boost/utility/addressof.hpp>
 #include <boost/utility/base_from_member.hpp>  
-
-namespace boost
-{
-//  next() and prior() template functions  -----------------------------------//
-
-    //  Helper functions for classes like bidirectional iterators not supporting
-    //  operator+ and operator-.
-    //
-    //  Usage:
-    //    const std::list<T>::iterator p = get_some_iterator();
-    //    const std::list<T>::iterator prev = boost::prior(p);
-
-    //  Contributed by Dave Abrahams
-
-    template <class T>
-    inline T next(T x) { return ++x; }
-
-    template <class T>
-    inline T prior(T x) { return --x; }
-
-
-//  class noncopyable  -------------------------------------------------------//
-
-    //  Private copy constructor and copy assignment ensure classes derived from
-    //  class noncopyable cannot be copied.
-
-    //  Contributed by Dave Abrahams
-
-    class noncopyable
-    {
-    protected:
-        noncopyable(){}
-        ~noncopyable(){}
-    private:  // emphasize the following members are private
-        noncopyable( const noncopyable& );
-        const noncopyable& operator=( const noncopyable& );
-    }; // noncopyable
-
-
-} // namespace boost
+#include <boost/checked_delete.hpp>
+#include <boost/next_prior.hpp>
+#include <boost/noncopyable.hpp>

 #endif  // BOOST_UTILITY_HPP
-
--- a/include/boost/utility/addressof.hpp
+++ b/include/boost/utility/addressof.hpp
@ -0,0 +1,43 @@
+// Copyright (C) 2002 Brad King (brad.king@kitware.com) 
+//                    Doug Gregor (gregod@cs.rpi.edu)
+//                    Peter Dimov
+//
+// Permission to copy, use, sell and distribute this software is granted
+// provided this copyright notice appears in all copies.
+// Permission to modify the code and to distribute modified code is granted
+// provided this copyright notice appears in all copies, and a notice
+// that the code was modified is included with the copyright notice.
+//
+// This software is provided "as is" without express or implied warranty,
+// and with no claim as to its suitability for any purpose.
+
+// For more information, see http://www.boost.org
+
+#ifndef BOOST_UTILITY_ADDRESSOF_HPP
+# define BOOST_UTILITY_ADDRESSOF_HPP
+
+# include <boost/config.hpp>
+# include <boost/detail/workaround.hpp>
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+#  include <boost/type_traits/add_pointer.hpp>
+# endif
+
+namespace boost {
+
+// Do not make addressof() inline. Breaks MSVC 7. (Peter Dimov)
+
+// VC7 strips const from nested classes unless we add indirection here
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+template <typename T> typename add_pointer<T>::type
+# else
+template <typename T> T*
+# endif
+addressof(T& v)
+{
+  return reinterpret_cast<T*>(
+       &const_cast<char&>(reinterpret_cast<const volatile char &>(v)));
+}
+
+}
+
+#endif // BOOST_UTILITY_ADDRESSOF_HPP
--- a/include/boost/utility/base_from_member.hpp
+++ b/include/boost/utility/base_from_member.hpp
@ -1,12 +1,10 @@
 //  boost utility/base_from_member.hpp header file  --------------------------//

-//  (C) Copyright Daryle Walker 2001.  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.
+//  Copyright 2001, 2003 Daryle Walker.  Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0.  (See accompanying file
+//  LICENSE_1_0.txt or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)

-//  See http://www.boost.org for most recent version including documentation.
+//  See <http://www.boost.org/libs/utility/> for the library's home page.

 #ifndef BOOST_UTILITY_BASE_FROM_MEMBER_HPP
 #define BOOST_UTILITY_BASE_FROM_MEMBER_HPP
@ -32,7 +30,7 @@ class base_from_member
 protected:
    MemberType  member;

-    explicit  base_from_member()
+    base_from_member()
        : member()
        {}

@ -51,6 +49,48 @@ protected:
        : member( x1, x2, x3 ) 
        {}

+    template< typename T1, typename T2, typename T3, typename T4 >
+    base_from_member( T1 x1, T2 x2, T3 x3, T4 x4 )
+        : member( x1, x2, x3, x4 ) 
+        {}
+
+    template< typename T1, typename T2, typename T3, typename T4, typename T5 >
+    base_from_member( T1 x1, T2 x2, T3 x3, T4 x4, T5 x5 )
+        : member( x1, x2, x3, x4, x5 ) 
+        {}
+
+    template< typename T1, typename T2, typename T3, typename T4, typename T5,
+     typename T6 >
+    base_from_member( T1 x1, T2 x2, T3 x3, T4 x4, T5 x5, T6 x6 )
+        : member( x1, x2, x3, x4, x5, x6 ) 
+        {}
+
+    template< typename T1, typename T2, typename T3, typename T4, typename T5,
+     typename T6, typename T7 >
+    base_from_member( T1 x1, T2 x2, T3 x3, T4 x4, T5 x5, T6 x6, T7 x7 )
+        : member( x1, x2, x3, x4, x5, x6, x7 ) 
+        {}
+
+    template< typename T1, typename T2, typename T3, typename T4, typename T5,
+     typename T6, typename T7, typename T8 >
+    base_from_member( T1 x1, T2 x2, T3 x3, T4 x4, T5 x5, T6 x6, T7 x7, T8 x8 )
+        : member( x1, x2, x3, x4, x5, x6, x7, x8 ) 
+        {}
+
+    template< typename T1, typename T2, typename T3, typename T4, typename T5,
+     typename T6, typename T7, typename T8, typename T9 >
+    base_from_member( T1 x1, T2 x2, T3 x3, T4 x4, T5 x5, T6 x6, T7 x7, T8 x8,
+     T9 x9 )
+        : member( x1, x2, x3, x4, x5, x6, x7, x8, x9 ) 
+        {}
+
+    template< typename T1, typename T2, typename T3, typename T4, typename T5,
+     typename T6, typename T7, typename T8, typename T9, typename T10 >
+    base_from_member( T1 x1, T2 x2, T3 x3, T4 x4, T5 x5, T6 x6, T7 x7, T8 x8,
+     T9 x9, T10 x10 )
+        : member( x1, x2, x3, x4, x5, x6, x7, x8, x9, x10 ) 
+        {}
+
 };  // boost::base_from_member

 }  // namespace boost
--- a/include/boost/utility/compare_pointees.hpp
+++ b/include/boost/utility/compare_pointees.hpp
@ -0,0 +1,68 @@
+// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
+//
+// 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)
+//
+// See http://www.boost.org/lib/optional for documentation.
+//
+// You are welcome to contact the author at:
+//  fernando_cacciola@hotmail.com
+//
+#ifndef BOOST_UTILITY_COMPARE_POINTEES_25AGO2003_HPP
+#define BOOST_UTILITY_COMPARE_POINTEES_25AGO2003_HPP
+
+#include<functional>
+
+namespace boost {
+
+// template<class OP> bool equal_pointees(OP const& x, OP const& y);
+// template<class OP> struct equal_pointees_t;
+//
+// Being OP a model of OptionalPointee (either a pointer or an optional):
+//
+// If both x and y have valid pointees, returns the result of (*x == *y)
+// If only one has a valid pointee, returns false.
+// If none have valid pointees, returns true.
+// No-throw
+template<class OptionalPointee>
+inline
+bool equal_pointees ( OptionalPointee const& x, OptionalPointee const& y )
+{
+  return (!x) != (!y) ? false : ( !x ? true : (*x) == (*y) ) ;
+}
+
+template<class OptionalPointee>
+struct equal_pointees_t : std::binary_function<OptionalPointee,OptionalPointee,bool>
+{
+  bool operator() ( OptionalPointee const& x, OptionalPointee const& y ) const
+    { return equal_pointees(x,y) ; }
+} ;
+
+// template<class OP> bool less_pointees(OP const& x, OP const& y);
+// template<class OP> struct less_pointees_t;
+//
+// Being OP a model of OptionalPointee (either a pointer or an optional):
+//
+// If y has not a valid pointee, returns false.
+// ElseIf x has not a valid pointee, returns true.
+// ElseIf both x and y have valid pointees, returns the result of (*x < *y)
+// No-throw
+template<class OptionalPointee>
+inline
+bool less_pointees ( OptionalPointee const& x, OptionalPointee const& y )
+{
+  return !y ? false : ( !x ? true : (*x) < (*y) ) ;
+}
+
+template<class OptionalPointee>
+struct less_pointees_t : std::binary_function<OptionalPointee,OptionalPointee,bool>
+{
+  bool operator() ( OptionalPointee const& x, OptionalPointee const& y ) const
+    { return less_pointees(x,y) ; }
+} ;
+
+} // namespace boost
+
+#endif
+
--- a/include/boost/utility/enable_if.hpp
+++ b/include/boost/utility/enable_if.hpp
@ -0,0 +1,119 @@
+// Boost enable_if library
+
+// Copyright 2003 <20> The Trustees of Indiana University.
+
+// 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)
+
+//    Authors: Jaakko J<>rvi (jajarvi at osl.iu.edu)
+//             Jeremiah Willcock (jewillco at osl.iu.edu)
+//             Andrew Lumsdaine (lums at osl.iu.edu)
+
+
+#ifndef BOOST_UTILITY_ENABLE_IF_HPP
+#define BOOST_UTILITY_ENABLE_IF_HPP
+
+#include "boost/config.hpp"
+
+// Even the definition of enable_if causes problems on some compilers,
+// so it's macroed out for all compilers that do not support SFINAE
+
+#ifndef BOOST_NO_SFINAE
+
+namespace boost
+{
+ 
+  template <bool B, class T = void>
+  struct enable_if_c {
+    typedef T type;
+  };
+
+  template <class T>
+  struct enable_if_c<false, T> {};
+
+  template <class Cond, class T = void> 
+  struct enable_if : public enable_if_c<Cond::value, T> {};
+
+  template <bool B, class T>
+  struct lazy_enable_if_c {
+    typedef typename T::type type;
+  };
+
+  template <class T>
+  struct lazy_enable_if_c<false, T> {};
+
+  template <class Cond, class T> 
+  struct lazy_enable_if : public lazy_enable_if_c<Cond::value, T> {};
+
+
+  template <bool B, class T = void>
+  struct disable_if_c {
+    typedef T type;
+  };
+
+  template <class T>
+  struct disable_if_c<true, T> {};
+
+  template <class Cond, class T = void> 
+  struct disable_if : public disable_if_c<Cond::value, T> {};
+
+  template <bool B, class T>
+  struct lazy_disable_if_c {
+    typedef typename T::type type;
+  };
+
+  template <class T>
+  struct lazy_disable_if_c<true, T> {};
+
+  template <class Cond, class T> 
+  struct lazy_disable_if : public lazy_disable_if_c<Cond::value, T> {};
+
+} // namespace boost
+
+#else
+
+namespace boost {
+
+  namespace detail { typedef void enable_if_default_T; }
+
+  template <typename T>
+  struct enable_if_does_not_work_on_this_compiler;
+
+  template <bool B, class T = detail::enable_if_default_T>
+  struct enable_if_c : enable_if_does_not_work_on_this_compiler<T>
+  { };
+
+  template <bool B, class T = detail::enable_if_default_T> 
+  struct disable_if_c : enable_if_does_not_work_on_this_compiler<T>
+  { };
+
+  template <bool B, class T = detail::enable_if_default_T> 
+  struct lazy_enable_if_c : enable_if_does_not_work_on_this_compiler<T>
+  { };
+
+  template <bool B, class T = detail::enable_if_default_T> 
+  struct lazy_disable_if_c : enable_if_does_not_work_on_this_compiler<T>
+  { };
+
+  template <class Cond, class T = detail::enable_if_default_T> 
+  struct enable_if : enable_if_does_not_work_on_this_compiler<T>
+  { };
+
+  template <class Cond, class T = detail::enable_if_default_T> 
+  struct disable_if : enable_if_does_not_work_on_this_compiler<T>
+  { };
+
+  template <class Cond, class T = detail::enable_if_default_T> 
+  struct lazy_enable_if : enable_if_does_not_work_on_this_compiler<T>
+  { };
+
+  template <class Cond, class T = detail::enable_if_default_T> 
+  struct lazy_disable_if : enable_if_does_not_work_on_this_compiler<T>
+  { };
+
+} // namespace boost
+
+#endif // BOOST_NO_SFINAE
+
+#endif
--- a/include/boost/utility/value_init.hpp
+++ b/include/boost/utility/value_init.hpp
@ -0,0 +1,82 @@
+// (C) 2002, Fernando Luis Cacciola Carballal.
+//
+// This material is provided "as is", with absolutely no warranty expressed
+// or implied. Any use is at your own risk.
+//
+// Permission to use or copy this software for any purpose is hereby granted
+// without fee, provided the above notices are retained on all copies.
+// Permission to modify the code and to distribute modified code is granted,
+// provided the above notices are retained, and a notice that the code was
+// modified is included with the above copyright notice.
+//
+// 21 Ago 2002 (Created) Fernando Cacciola
+//
+#ifndef BOOST_UTILITY_VALUE_INIT_21AGO2002_HPP
+#define BOOST_UTILITY_VALUE_INIT_21AGO2002_HPP
+
+#include "boost/detail/select_type.hpp"
+#include "boost/type_traits/cv_traits.hpp"
+
+namespace boost {
+
+namespace vinit_detail {
+
+template<class T>
+class const_T_base
+{
+  protected :
+
+   const_T_base() : x() {}
+
+   T x ;
+} ;
+
+template<class T>
+struct non_const_T_base
+{
+  protected :
+
+   non_const_T_base() : x() {}
+
+   mutable T x ;
+} ;
+
+template<class T>
+struct select_base
+{
+  typedef typename
+    detail::if_true< ::boost::is_const<T>::value >
+      ::template then< const_T_base<T>, non_const_T_base<T> >::type type ;
+} ;
+
+} // namespace vinit_detail
+
+template<class T>
+class value_initialized : private vinit_detail::select_base<T>::type
+{
+  public :
+
+    value_initialized() {}
+
+    operator T&() const { return this->x ; }
+
+    T& data() const { return this->x ; }
+
+} ;
+
+template<class T>
+T const& get ( value_initialized<T> const& x )
+{
+  return x.data() ;
+}
+template<class T>
+T& get ( value_initialized<T>& x )
+{
+  return x.data() ;
+}
+
+} // namespace boost
+
+
+#endif
+
--- a/include/boost/utility_fwd.hpp
+++ b/include/boost/utility_fwd.hpp
@ -1,12 +1,10 @@
 //  Boost utility_fwd.hpp header file  ---------------------------------------//

-//  (C) Copyright boost.org 2001.  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.
+//  Copyright 2001, 2003 Boost.org.  Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0.  (See accompanying file
+//  LICENSE_1_0.txt or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)

-//  See http://www.boost.org for most recent version including documentation.
+//  See <http://www.boost.org/libs/utility/> for the library's home page.

 #ifndef BOOST_UTILITY_FWD_HPP
 #define BOOST_UTILITY_FWD_HPP
@ -22,12 +20,13 @@ template < typename MemberType, int UniqueID = 0 >
    class base_from_member;


-//  From <boost/utility.hpp>  ------------------------------------------------//
+//  From <boost/noncopyable.hpp>  --------------------------------------------//

 class noncopyable;

 // Also has a few function templates

+
 }  // namespace boost


--- a/index.html
+++ b/index.html
@ -0,0 +1,34 @@
+<html>
+	<head>
+		<meta http-equiv="Content-Language" content="en-us">
+		<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
+		<meta name="ProgId" content="FrontPage.Editor.Document">
+		<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+		<title>Boost Utility Library</title>
+	</head>
+	<body bgcolor="#FFFFFF">
+		<h1><IMG SRC="../../c++boost.gif" WIDTH="276" HEIGHT="86" align="center">Boost 
+			Utility Library</h1>
+		<p>The Boost Utility Library isn't really a single library at all. It is just a 
+			collection for components too small to be called libraries in their own right.</p>
+		<p>But that doesn't mean there isn't useful stuff here. Take a look:</p>
+		<blockquote>
+			<p>
+				<a href="assert.html">assert</a><br>
+				<a href="base_from_member.html">base_from_member</a><br>
+				<a href="call_traits.htm">call_traits</a><br>
+				<a href="checked_delete.html">checked_delete</a><br>
+				<a href="compressed_pair.htm">compressed_pair</a><br>
+				<a href="enable_if.html">enable_if</a><br>
+                <a href="iterator_adaptors.htm">iterator_adaptors</a><br>
+				<a href="operators.htm">operators</a><br>
+				<a href="throw_exception.html">throw_exception</a><br>
+				<a href="utility.htm">utility</a><br>
+                <a href="value_init.htm">value_init</a></p>
+		</blockquote>
+		<hr>
+		<p>Revised 
+			<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->01 September, 2003<!--webbot bot="Timestamp" endspan i-checksum="38582" --></p>
+		<p>&nbsp;</p>
+	</body>
+</html>
--- a/indirect_iterator.htm
+++ b/indirect_iterator.htm
@ -1,444 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<html>
-<head>
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-    <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-    <meta name="ProgId" content="FrontPage.Editor.Document">
-
-    <title>Indirect Iterator Adaptor Documentation</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-	
-    <img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" align=
-    "center" width="277" height="86"> 
-
-    <h1>Indirect Iterator Adaptor</h1>
-    Defined in header <a href=
-    "../../boost/iterator_adaptors.hpp">boost/iterator_adaptors.hpp</a> 
-
-    <p>The indirect iterator adaptor augments an iterator by applying an
-    <b>extra</b> dereference inside of <tt>operator*()</tt>. For example, this
-    iterator makes it possible to view a container of pointers or
-    smart-pointers (e.g. <tt>std::list&lt;boost::shared_ptr&lt;foo&gt;
-    &gt;</tt>) as if it were a container of the pointed-to type. The following
-    <b>pseudo-code</b> shows the basic idea of the indirect iterator:
-
-    <blockquote>
-<pre>
-// inside a hypothetical indirect_iterator class...
-typedef std::iterator_traits&lt;BaseIterator&gt;::value_type Pointer;
-typedef std::iterator_traits&lt;Pointer&gt;::reference reference;
-
-reference indirect_iterator::operator*() const {
-  return **this-&gt;base_iterator;
-}
-</pre>
-    </blockquote>
-
-    <h2>Synopsis</h2>
-
-    <blockquote>
-<pre>
-namespace boost {
-  template &lt;class BaseIterator,
-            class Value, class Reference, class Category, class Pointer&gt;
-  struct indirect_iterator_generator;
-  
-  template &lt;class BaseIterator,
-            class Value, class Reference, class ConstReference, 
-            class Category, class Pointer, class ConstPointer&gt;
-  struct indirect_iterator_pair_generator;
-
-  template &lt;class BaseIterator&gt;
-  typename indirect_iterator_generator&lt;BaseIterator&gt;::type
-  make_indirect_iterator(BaseIterator base)  
-}
-</pre>
-    </blockquote>
-    <hr>
-
-    <h2><a name="indirect_iterator_generator">The Indirect Iterator Type
-    Generator</a></h2>
-    The <tt>indirect_iterator_generator</tt> template is a <a href=
-    "../../more/generic_programming.html#type_generator">generator</a> of
-    indirect iterator types. The main template parameter for this class is the
-    <tt>BaseIterator</tt> type that is being wrapped. In most cases the type of
-    the elements being pointed to can be deduced using
-    <tt>std::iterator_traits</tt>, but in some situations the user may want to
-    override this type, so there are also template parameters that allow a user
-    to control the <tt>value_type</tt>, <tt>pointer</tt>, and
-    <tt>reference</tt> types of the resulting iterators. 
-
-    <blockquote>
-<pre>
-template &lt;class BaseIterator,
-          class Value, class Reference, class Pointer&gt;
-class indirect_iterator_generator
-{
-public:
-  typedef <tt><a href=
-"./iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt;...&gt;</tt> type; // the resulting indirect iterator type 
-};
-</pre>
-    </blockquote>
-
-    <h3>Example</h3>
-    This example uses the <tt>indirect_iterator_generator</tt> to create
-    indirect iterators which dereference the pointers stored in the
-    <tt>pointers_to_chars</tt> array to access the <tt>char</tt>s in the
-    <tt>characters</tt> array. 
-
-    <blockquote>
-<pre>
-#include &lt;boost/config.hpp&gt;
-#include &lt;vector&gt;
-#include &lt;iostream&gt;
-#include &lt;iterator&gt;
-#include &lt;boost/iterator_adaptors.hpp&gt;
-
-int main(int, char*[])
-{
-  char characters[] = "abcdefg";
-  const int N = sizeof(characters)/sizeof(char) - 1; // -1 since characters has a null char
-  char* pointers_to_chars[N];                        // at the end.
-  for (int i = 0; i &lt; N; ++i)
-    pointers_to_chars[i] = &amp;characters[i];
-  
-  boost::indirect_iterator_generator&lt;char**, char&gt;::type 
-    indirect_first(pointers_to_chars), indirect_last(pointers_to_chars + N);
-
-  std::copy(indirect_first, indirect_last, std::ostream_iterator&lt;char&gt;(std::cout, ","));
-  std::cout &lt;&lt; std::endl;
-  
-  // to be continued...
-</pre>
-    </blockquote>
-
-    <h3>Template Parameters</h3>
-
-    <table border>
-      <tr>
-        <th>Parameter
-
-        <th>Description
-
-      <tr>
-        <td><tt>BaseIterator</tt> 
-
-        <td>The iterator type being wrapped. The <tt>value_type</tt>
-        of the base iterator should itself be dereferenceable.  
-        The return type of the <tt>operator*</tt> for the
-        <tt>value_type</tt> should match the <tt>Reference</tt> type.
-
-      <tr>
-        <td><tt>Value</tt> 
-
-        <td>The <tt>value_type</tt> of the resulting iterator, unless const. If
-        Value is <tt>const X</tt>, a conforming compiler makes the
-        <tt>value_type</tt> <tt><i>non-</i>const X</tt><a href=
-        "iterator_adaptors.htm#1">[1]</a>. Note that if the default
-         is used for <tt>Value</tt>, then there must be a valid specialization
-         of <tt>iterator_traits</tt> for the value type of the base iterator.
-         <br>
-         <b>Default:</b> <tt>std::iterator_traits&lt;<br>
-         <20> std::iterator_traits&lt;BaseIterator&gt;::value_type
-        &gt;::value_type</tt><a href="#2">[2]</a> 
-
-      <tr>
-        <td><tt>Reference</tt> 
-
-        <td>The <tt>reference</tt> type of the resulting iterator, and in
-        particular, the result type of <tt>operator*()</tt>.<br>
-         <b>Default:</b> <tt>Value&amp;</tt> 
-
-      <tr>
-        <td><tt>Pointer</tt> 
-
-        <td>The <tt>pointer</tt> type of the resulting iterator, and in
-        particular, the result type of <tt>operator-&gt;()</tt>.<br>
-         <b>Default:</b> <tt>Value*</tt> 
-
-      <tr>
-        <td><tt>Category</tt> 
-        <td>The <tt>iterator_category</tt> type for the resulting iterator.<br>
-         <b>Default:</b>
-        <tt>std::iterator_traits&lt;BaseIterator&gt;::iterator_category</tt> 
-
-    </table>
-
-    <h3>Concept Model</h3>
-    The indirect iterator will model whichever <a href=
-    "http://www.sgi.com/tech/stl/Iterators.html">standard iterator
-    concept category</a> is modeled by the base iterator. Thus, if the
-    base iterator is a model of <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-    Access Iterator</a> then so is the resulting indirect iterator. If
-    the base iterator models a more restrictive concept, the resulting
-    indirect iterator will model the same concept <a href="#3">[3]</a>.
-
-    <h3>Members</h3>
-    The indirect iterator type implements the member functions and operators
-    required of the <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access
-    Iterator</a> concept. In addition it has the following constructor: 
-<pre>
-explicit indirect_iterator_generator::type(const BaseIterator&amp; it)
-</pre>
-    <br>
-     <br>
-     
-    <hr>
-
-    <p>
-
-    <h2><a name="indirect_iterator_pair_generator">The Indirect Iterator Pair
-    Generator</a></h2>
-    Sometimes a pair of <tt>const</tt>/non-<tt>const</tt> pair of iterators is
-    needed, such as when implementing a container. The
-    <tt>indirect_iterator_pair_generator</tt> class makes it more convenient to
-    create this pair of iterator types. 
-
-    <blockquote>
-<pre>
-  template &lt;class BaseIterator,
-            class Value, class Reference, class ConstReference, 
-            class Category, class Pointer, class ConstPointer&gt;
-  struct indirect_iterator_pair_generator;
-{
-public:
-  typedef <tt><a href=
-"./iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt;...&gt;</tt> iterator;       // the mutable indirect iterator type 
-  typedef <tt><a href=
-"./iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt;...&gt;</tt> const_iterator; // the immutable indirect iterator type 
-};
-</pre>
-    </blockquote>
-
-    <h3>Example</h3>
-
-    <blockquote>
-<pre>
-  // continuing from the last example...
-
-  typedef boost::indirect_iterator_pair_generator&lt;char**,
-    char, char*, char&amp;, const char*, const char&amp;&gt; PairGen;
-
-  char mutable_characters[N];
-  char* pointers_to_mutable_chars[N];
-  for (int i = 0; i &lt; N; ++i)
-    pointers_to_mutable_chars[i] = &amp;mutable_characters[i];
-
-  PairGen::iterator mutable_indirect_first(pointers_to_mutable_chars),
-    mutable_indirect_last(pointers_to_mutable_chars + N);
-  PairGen::const_iterator const_indirect_first(pointers_to_chars),
-    const_indirect_last(pointers_to_chars + N);
-
-  std::transform(const_indirect_first, const_indirect_last,
-     mutable_indirect_first, std::bind1st(std::plus&lt;char&gt;(), 1));
-
-  std::copy(mutable_indirect_first, mutable_indirect_last,
-      std::ostream_iterator&lt;char&gt;(std::cout, ","));
-  std::cout &lt;&lt; std::endl;
-  // to be continued...
-</pre>
-    </blockquote>
-
-    <p>The output is:
-
-    <blockquote>
-<pre>
-b,c,d,e,f,g,h,
-</pre>
-    </blockquote>
-
-    <h3>Template Parameters</h3>
-
-    <table border>
-      <tr>
-        <th>Parameter
-
-        <th>Description
-
-      <tr>
-        <td><tt>BaseIterator</tt> 
-
-        <td>The iterator type being wrapped. The <tt>value_type</tt> of the
-        base iterator should itself be dereferenceable.
-        The return type of the <tt>operator*</tt> for the
-        <tt>value_type</tt> should match the <tt>Reference</tt> type.
-
-      <tr>
-        <td><tt>Value</tt> 
-
-        <td>The <tt>value_type</tt> of the resulting iterators.
-         If Value is <tt>const X</tt>, a conforming compiler makes the
-         <tt>value_type</tt> <tt><i>non-</i>const X</tt><a href=
-         "iterator_adaptors.htm#1">[1]</a>. Note that if the default
-         is used for <tt>Value</tt>, then there must be a valid
-         specialization of <tt>iterator_traits</tt> for the value type
-         of the base iterator.<br>
-
-         <b>Default:</b> <tt>std::iterator_traits&lt;<br>
-         <20> std::iterator_traits&lt;BaseIterator&gt;::value_type
-        &gt;::value_type</tt><a href="#2">[2]</a> 
-
-      <tr>
-        <td><tt>Reference</tt> 
-
-        <td>The <tt>reference</tt> type of the resulting <tt>iterator</tt>, and
-        in particular, the result type of its <tt>operator*()</tt>.<br>
-         <b>Default:</b> <tt>Value&amp;</tt> 
-
-      <tr>
-        <td><tt>ConstReference</tt> 
-
-        <td>The <tt>reference</tt> type of the resulting
-        <tt>const_iterator</tt>, and in particular, the result type of its
-        <tt>operator*()</tt>.<br>
-         <b>Default:</b> <tt>const Value&amp;</tt> 
-
-      <tr>
-        <td><tt>Category</tt> 
-        <td>The <tt>iterator_category</tt> type for the resulting iterator.<br>
-         <b>Default:</b>
-        <tt>std::iterator_traits&lt;BaseIterator&gt;::iterator_category</tt> 
-
-      <tr>
-        <td><tt>Pointer</tt> 
-
-        <td>The <tt>pointer</tt> type of the resulting <tt>iterator</tt>, and
-        in particular, the result type of its <tt>operator-&gt;()</tt>.<br>
-         <b>Default:</b> <tt>Value*</tt> 
-
-      <tr>
-        <td><tt>ConstPointer</tt> 
-
-        <td>The <tt>pointer</tt> type of the resulting <tt>const_iterator</tt>,
-        and in particular, the result type of its <tt>operator-&gt;()</tt>.<br>
-         <b>Default:</b> <tt>const Value*</tt> 
-
-    </table>
-
-    <h3>Concept Model</h3>
-
-    The indirect iterators will model whichever <a href=
-    "http://www.sgi.com/tech/stl/Iterators.html">standard iterator
-    concept category</a> is modeled by the base iterator. Thus, if the
-    base iterator is a model of <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-    Access Iterator</a> then so are the resulting indirect
-    iterators. If the base iterator models a more restrictive concept,
-    the resulting indirect iterators will model the same concept <a
-    href="#3">[3]</a>.
-
-
-    <h3>Members</h3>
-    The resulting <tt>iterator</tt> and <tt>const_iterator</tt> types implement
-    the member functions and operators required of the <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access
-    Iterator</a> concept. In addition they support the following constructors: 
-
-    <blockquote>
-<pre>
-explicit indirect_iterator_pair_generator::iterator(const BaseIterator&amp; it)
-explicit indirect_iterator_pair_generator::const_iterator(const BaseIterator&amp; it)
-</pre>
-    </blockquote>
-    <br>
-     <br>
-     
-    <hr>
-
-    <p>
-
-    <h2><a name="make_indirect_iterator">The Indirect Iterator Object
-    Generator</a></h2>
-    The <tt>make_indirect_iterator()</tt> function provides a more convenient
-    way to create indirect iterator objects. The function saves the user the
-    trouble of explicitly writing out the iterator types. 
-
-    <blockquote>
-<pre>
-template &lt;class BaseIterator&gt;
-typename indirect_iterator_generator&lt;BaseIterator&gt;::type
-make_indirect_iterator(BaseIterator base)  
-</pre>
-    </blockquote>
-
-    <h3>Example</h3>
-    Here we again print the <tt>char</tt>s from the array <tt>characters</tt>
-    by accessing them through the array of pointers <tt>pointer_to_chars</tt>,
-    but this time we use the <tt>make_indirect_iterator()</tt> function which
-    saves us some typing. 
-
-    <blockquote>
-<pre>
-  // continuing from the last example...
-
-  std::copy(boost::make_indirect_iterator(pointers_to_chars), 
-      boost::make_indirect_iterator(pointers_to_chars + N),
-      std::ostream_iterator&lt;char&gt;(std::cout, ","));
-  std::cout &lt;&lt; std::endl;
-
-  return 0;
-}
-</pre>
-    </blockquote>
-    The output is: 
-
-    <blockquote>
-<pre>
-a,b,c,d,e,f,g,
-</pre>
-    </blockquote>
-    <hr>
-
-    <h3>Notes</h3>
-
-    <p>
-
-    <p><a name="2">[2]</a> If your compiler does not support partial
-    specialization and the base iterator or its <tt>value_type</tt> is a
-    builtin pointer type, you will not be able to use the default for
-    <tt>Value</tt> and will need to specify this type explicitly.
-
-    <p><a name="3">[3]</a>There is a caveat to which concept the
-    indirect iterator can model.  If the return type of the
-    <tt>operator*</tt> for the base iterator's value type is not a
-    true reference, then strickly speaking, the indirect iterator can
-    not be a model of <a href=
-    "http://www.sgi.com/tech/stl/ForwardIterator.html">Forward
-    Iterator</a> or any of the concepts that refine it. In this case
-    the <tt>Category</tt> for the indirect iterator should be
-    specified as <tt>std::input_iterator_tag</tt>. However, even in
-    this case, if the base iterator is a random access iterator, the
-    resulting indirect iterator will still satisfy most of the
-    requirements for <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-    Access Iterator</a>.
-    
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->18 Sep 2001<!--webbot bot="Timestamp" endspan i-checksum="14941" -->
-
-
-    <p>&copy; Copyright Jeremy Siek and David Abrahams 2001. Permission to
-    copy, use, modify, sell and distribute this document is granted provided
-    this copyright notice appears in all copies. This document is provided "as
-    is" without express or implied warranty, and with no claim as to its
-    suitability for any purpose. 
-    <!--  LocalWords:  html charset alt gif hpp BaseIterator const namespace struct
-             -->
-     
-    <!--  LocalWords:  ConstPointer ConstReference typename iostream int abcdefg
-             -->
-     <!--  LocalWords:  sizeof  PairGen pre Jeremy Siek David Abrahams
-             -->
-
-
-</body>
-</html>
--- a/indirect_iterator_example.cpp
+++ b/indirect_iterator_example.cpp
@ -8,7 +8,8 @@
 #include <iostream>
 #include <iterator>
 #include <functional>
-#include <boost/iterator_adaptors.hpp>
+#include <algorithm>
+#include <boost/iterator/indirect_iterator.hpp>

 int main(int, char*[])
 {
@ -20,7 +21,7 @@ int main(int, char*[])

  // Example of using indirect_iterator_generator
  
-  boost::indirect_iterator_generator<char**, char>::type 
+  boost::indirect_iterator<char**, char>
    indirect_first(pointers_to_chars), indirect_last(pointers_to_chars + N);

  std::copy(indirect_first, indirect_last, std::ostream_iterator<char>(std::cout, ","));
@ -29,16 +30,14 @@ int main(int, char*[])

  // Example of using indirect_iterator_pair_generator

-  typedef boost::indirect_iterator_pair_generator<char**, char> PairGen;
-
  char mutable_characters[N];
  char* pointers_to_mutable_chars[N];
  for (int j = 0; j < N; ++j)
    pointers_to_mutable_chars[j] = &mutable_characters[j];

-  PairGen::iterator mutable_indirect_first(pointers_to_mutable_chars),
+  boost::indirect_iterator<char* const*> mutable_indirect_first(pointers_to_mutable_chars),
    mutable_indirect_last(pointers_to_mutable_chars + N);
-  PairGen::const_iterator const_indirect_first(pointers_to_chars),
+  boost::indirect_iterator<char* const*, char const> const_indirect_first(pointers_to_chars),
    const_indirect_last(pointers_to_chars + N);

  std::transform(const_indirect_first, const_indirect_last,
@ -51,12 +50,10 @@ int main(int, char*[])
  
  // Example of using make_indirect_iterator()

-#ifndef BOOST_MSVC
  std::copy(boost::make_indirect_iterator(pointers_to_chars), 
            boost::make_indirect_iterator(pointers_to_chars + N),
            std::ostream_iterator<char>(std::cout, ","));
  std::cout << std::endl;
-#endif
  
  return 0;
 }
--- a/indirect_iterator_test.cpp
+++ b/indirect_iterator_test.cpp
@ -1,151 +0,0 @@
-//  (C) Copyright Jeremy Siek 1999. 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.
-
-//  Revision History
-//  08 Mar 2001   Jeremy Siek
-//       Moved test of indirect iterator into its own file. It to
-//       to be in iterator_adaptor_test.cpp.
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <algorithm>
-
-#include <boost/iterator_adaptors.hpp>
-#include <boost/pending/iterator_tests.hpp>
-#include <boost/concept_archetype.hpp>
-#include <stdlib.h>
-#include <deque>
-#include <set>
-
-struct my_iterator_tag : public std::random_access_iterator_tag { };
-
-using boost::dummyT;
-
-typedef std::deque<int> storage;
-typedef std::deque<int*> pointer_deque;
-typedef std::set<storage::iterator> iterator_set;
-
-void more_indirect_iterator_tests()
-{
-// For some reason all heck breaks loose in the compiler under these conditions.
-#if !defined(BOOST_MSVC) || !defined(__STL_DEBUG)
-    storage store(1000);
-    std::generate(store.begin(), store.end(), rand);
-    
-    pointer_deque ptr_deque;
-    iterator_set iter_set;
-
-    for (storage::iterator p = store.begin(); p != store.end(); ++p)
-    {
-        ptr_deque.push_back(&*p);
-        iter_set.insert(p);
-    }
-
-    typedef boost::indirect_iterator_pair_generator<
-        pointer_deque::iterator
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-        , int
-#endif
-    > IndirectDeque;
-
-    IndirectDeque::iterator db(ptr_deque.begin());
-    IndirectDeque::iterator de(ptr_deque.end());
-    assert(static_cast<std::size_t>(de - db) == store.size());
-    assert(db + store.size() == de);
-    IndirectDeque::const_iterator dci(db);
-    assert(db == dci);
-    assert(dci == db);
-    assert(dci != de);
-    assert(dci < de);
-    assert(dci <= de);
-    assert(de >= dci);
-    assert(de > dci);
-    dci = de;
-    assert(dci == de);
-
-    boost::random_access_iterator_test(db + 1, store.size() - 1, boost::next(store.begin()));
-    
-    *db = 999;
-    assert(store.front() == 999);
-
-    // Borland C++ is getting very confused about the typedef's here
-
-    typedef boost::indirect_iterator_generator<
-        iterator_set::iterator
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-        , int
-#endif
-        >::type indirect_set_iterator;
-
-    typedef boost::indirect_iterator_generator<
-        iterator_set::iterator,
-        const int
-        >::type const_indirect_set_iterator;
-
-    indirect_set_iterator sb(iter_set.begin());
-    indirect_set_iterator se(iter_set.end());
-    const_indirect_set_iterator sci(iter_set.begin());
-    assert(sci == sb);
-    assert(sci != se);
-    sci = se;
-    assert(sci == se);
-    
-    *boost::prior(se) = 888;
-    assert(store.back() == 888);
-    assert(std::equal(sb, se, store.begin()));
-
-    boost::bidirectional_iterator_test(boost::next(sb), store[1], store[2]);
-    assert(std::equal(db, de, store.begin()));
-
-#endif    
-}
-
-int
-main()
-{
-  dummyT array[] = { dummyT(0), dummyT(1), dummyT(2), 
-                     dummyT(3), dummyT(4), dummyT(5) };
-  const int N = sizeof(array)/sizeof(dummyT);
-
-  // Test indirect_iterator_generator
-  {
-    dummyT* ptr[N];
-    for (int k = 0; k < N; ++k)
-      ptr[k] = array + k;
-
-    typedef boost::indirect_iterator_generator<dummyT**
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-        , dummyT
-#endif
-      >::type indirect_iterator;
-
-    typedef boost::indirect_iterator_generator<dummyT**, const dummyT>::type const_indirect_iterator;
-
-    indirect_iterator i(ptr);
-    boost::random_access_iterator_test(i, N, array);
-
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-    boost::random_access_iterator_test(boost::make_indirect_iterator(ptr), N, array);
-#endif
-    
-    // check operator->
-    assert((*i).m_x == i->foo());
-
-    const_indirect_iterator j(ptr);
-    boost::random_access_iterator_test(j, N, array);
-
-    dummyT*const* const_ptr = ptr;
-    
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-    boost::random_access_iterator_test(boost::make_indirect_iterator(const_ptr), N, array);
-#endif
-    boost::const_nonconst_iterator_test(i, ++j);
-
-    more_indirect_iterator_tests();
-  }
-  std::cout << "test successful " << std::endl;
-  return 0;
-}
--- a/iter_adaptor_fail_expected1.cpp
+++ b/iter_adaptor_fail_expected1.cpp
@ -1,27 +0,0 @@
-//  Test boost/pending/iterator_adaptors.hpp
-
-//  (C) Copyright Jeremy Siek 1999. 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.
-
-//  See http://www.boost.org for most recent version including documentation.
-
-// Revision History
-// 21 Jan 01 Initial version (Jeremy Siek)
-
-#include <boost/config.hpp>
-#include <list>
-#include <boost/pending/iterator_adaptors.hpp>
-
-int main()
-{
-  typedef boost::iterator_adaptor<std::list<int>::iterator,
-    boost::default_iterator_policies,
-    int,int&,int*,std::bidirectional_iterator_tag> adaptor_type;
-  
-  adaptor_type i;
-  i += 4;
-  return 0;
-}
--- a/iter_adaptor_fail_expected2.cpp
+++ b/iter_adaptor_fail_expected2.cpp
@ -1,28 +0,0 @@
-//  Test boost/pending/iterator_adaptors.hpp
-
-//  (C) Copyright Jeremy Siek 1999. 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.
-
-//  See http://www.boost.org for most recent version including documentation.
-
-// Revision History
-// 21 Jan 01 Initial version (Jeremy Siek)
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <iterator>
-#include <boost/pending/iterator_adaptors.hpp>
-
-int main()
-{
-  typedef boost::iterator_adaptor<std::istream_iterator<int>,
-    boost::default_iterator_policies,
-    int,int&,int*,std::input_iterator_tag> adaptor_type;
-  
-  adaptor_type iter;
-  --iter;
-  return 0;
-}
--- a/iter_traits_gen_test.cpp
+++ b/iter_traits_gen_test.cpp
@ -1,61 +0,0 @@
-// (C) Copyright Jeremy Siek 2000. 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.
-
-// 04 Nov 2001   Jeremy Siek
-//     Updated with respect to new named parameter interface.
-// 08 Mar 2001   Jeremy Siek
-//     Initial checkin.
-
-#include <boost/iterator_adaptors.hpp>
-#include <boost/pending/iterator_tests.hpp>
-#include <boost/static_assert.hpp>
-
-class bar { };
-void foo(bar) { }
-
-int
-main()
-{
-  using boost::dummyT;
-  dummyT array[] = { dummyT(0), dummyT(1), dummyT(2), 
-                     dummyT(3), dummyT(4), dummyT(5) };
-  typedef boost::iterator_adaptor<dummyT*, 
-    boost::default_iterator_policies, dummyT> my_iter;
-  my_iter mi(array);
-
-  {
-    typedef boost::iterator_adaptor<my_iter, boost::default_iterator_policies,
-      boost::reference_is<dummyT>,
-      boost::iterator_category_is<std::input_iterator_tag> > iter_type;
-
-    BOOST_STATIC_ASSERT((boost::is_same<iter_type::iterator_category*,
-       std::input_iterator_tag*>::value));
-
-    BOOST_STATIC_ASSERT(( ! boost::is_convertible<iter_type::iterator_category*,
-       std::forward_iterator_tag*>::value));
-
-    iter_type i(mi);
-    boost::input_iterator_test(i, dummyT(0), dummyT(1));
-  }
-  {
-    typedef boost::iterator_adaptor<dummyT*,
-      boost::default_iterator_policies,
-      boost::value_type_is<dummyT>,
-      boost::reference_is<const dummyT&>,
-      boost::pointer_is<const dummyT*> ,
-      boost::iterator_category_is<std::forward_iterator_tag>,
-      boost::difference_type_is<std::ptrdiff_t> > adaptor_type;
-
-    adaptor_type i(array);
-
-    boost::input_iterator_test(i, dummyT(0), dummyT(1));
-    int zero = 0;
-    if (zero) // don't do this, just make sure it compiles
-      assert((*i).m_x == i->foo());      
-  }
-
-  return 0;
-}
--- a/iterator_adaptor_examples.cpp
+++ b/iterator_adaptor_examples.cpp
@ -7,7 +7,7 @@
 #include <functional>
 #include <algorithm>
 #include <iostream>
-#include <boost/iterator_adaptors.hpp>
+#include <boost/iterator/transform_iterator.hpp>
 #include <boost/pending/integer_range.hpp>

 int
@ -21,8 +21,8 @@ main(int, char*[])
  int x[] = { 1, 2, 3, 4, 5, 6, 7, 8 };

  typedef std::binder1st< std::multiplies<int> > Function;
-  typedef boost::transform_iterator_generator<Function, int* 
-  >::type doubling_iterator;
+  
+  typedef boost::transform_iterator<Function, int*> doubling_iterator;

  doubling_iterator i(x, std::bind1st(std::multiplies<int>(), 2)),
    i_end(x + sizeof(x)/sizeof(int), std::bind1st(std::multiplies<int>(), 2));
--- a/iterator_adaptor_test.cpp
+++ b/iterator_adaptor_test.cpp
@ -1,449 +0,0 @@
-//  Test boost/iterator_adaptors.hpp
-
-//  (C) Copyright Jeremy Siek 1999. 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.
-
-//  See http://www.boost.org for most recent version including documentation.
-
-//  Revision History
-//  30 Nov 01 Added permutation_iterator.(Toon Knapen)
-//  19 Nov 01 Added generator_iterator.  (Jens Maurer)
-//  04 Nov 01 Updated with respect to change in named parameters.
-//            (Jeremy Siek)
-//  08 Mar 01 Moved indirect and transform tests to separate files.
-//            (Jeremy Siek)
-//  19 Feb 01 Take adavantage of improved iterator_traits to do more tests
-//            on MSVC. Hack around an MSVC-with-STLport internal compiler
-//            error. (David Abrahams)
-//  11 Feb 01 Added test of operator-> for forward and input iterators.
-//            (Jeremy Siek)
-//  11 Feb 01 Borland fixes (David Abrahams)
-//  10 Feb 01 Use new adaptors interface. (David Abrahams)
-//  10 Feb 01 Use new filter_ interface. (David Abrahams)
-//  09 Feb 01 Use new reverse_ and indirect_ interfaces. Replace
-//            BOOST_NO_STD_ITERATOR_TRAITS with
-//            BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION to prove we've
-//            normalized to core compiler capabilities (David Abrahams)
-//  08 Feb 01 Use Jeremy's new make_reverse_iterator form; add more
-//            comprehensive testing. Force-decay array function arguments to
-//            pointers.
-//  07 Feb 01 Added tests for the make_xxx_iterator() helper functions.
-//            (Jeremy Siek)
-//  07 Feb 01 Replaced use of xxx_pair_generator with xxx_generator where
-//            possible (which was all but the projection iterator).
-//            (Jeremy Siek)
-//  06 Feb 01 Removed now-defaulted template arguments where possible
-//            Updated names to correspond to new generator naming convention.
-//            Added a trivial test for make_transform_iterator().
-//            Gave traits for const iterators a mutable value_type, per std.
-//            Resurrected my original tests for indirect iterators.
-//            (David Abrahams)
-//  04 Feb 01 Fix for compilers without standard iterator_traits
-//            (David Abrahams)
-//  13 Jun 00 Added const version of the iterator tests (Jeremy Siek)
-//  12 Dec 99 Initial version with iterator operators (Jeremy Siek)
-
-#include <boost/config.hpp>
-#include <iostream>
-
-#include <algorithm>
-#include <functional>
-#include <numeric>
-
-#include <boost/iterator_adaptors.hpp>
-#include <boost/generator_iterator.hpp>
-#include <boost/pending/iterator_tests.hpp>
-#include <boost/pending/integer_range.hpp>
-#include <boost/concept_archetype.hpp>
-#include <boost/type_traits/same_traits.hpp>
-#include <boost/permutation_iterator.hpp>
-#include <stdlib.h>
-#include <vector>
-#include <deque>
-#include <set>
-#include <list>
-
-struct my_iterator_tag : public std::random_access_iterator_tag { };
-
-using boost::dummyT;
-
-
-struct mult_functor {
-  typedef int result_type;
-  typedef int argument_type;
-  // Functors used with transform_iterator must be
-  // DefaultConstructible, as the transform_iterator must be
-  // DefaultConstructible to satisfy the requirements for
-  // TrivialIterator.
-  mult_functor() { }
-  mult_functor(int aa) : a(aa) { }
-  int operator()(int b) const { return a * b; }
-  int a;
-};
-
-template <class Pair>
-struct select1st_ 
-  : public std::unary_function<Pair, typename Pair::first_type>
-{
-  const typename Pair::first_type& operator()(const Pair& x) const {
-    return x.first;
-  }
-  typename Pair::first_type& operator()(Pair& x) const {
-    return x.first;
-  }
-};
-
-struct one_or_four {
-  bool operator()(dummyT x) const {
-    return x.foo() == 1 || x.foo() == 4;
-  }
-};
-
-typedef std::deque<int> storage;
-typedef std::deque<int*> pointer_deque;
-typedef std::set<storage::iterator> iterator_set;
-
-template <class T> struct foo;
-
-void blah(int) { }
-
-struct my_gen
-{
-  typedef int result_type;
-  my_gen() : n(0) { }
-  int operator()() { return ++n; }
-  int n;
-};
-
-int
-main()
-{
-  dummyT array[] = { dummyT(0), dummyT(1), dummyT(2), 
-                     dummyT(3), dummyT(4), dummyT(5) };
-  const int N = sizeof(array)/sizeof(dummyT);
-
-  // sanity check, if this doesn't pass the test is buggy
-  boost::random_access_iterator_test(array, N, array);
-
-  // Check that the policy concept checks and the default policy
-  // implementation match up.
-  boost::function_requires< 
-     boost::RandomAccessIteratorPoliciesConcept<
-       boost::default_iterator_policies,
-       boost::iterator_adaptor<int*, boost::default_iterator_policies>,
-       boost::iterator<std::random_access_iterator_tag, int, std::ptrdiff_t,
-                      int*, int&>
-      > >();
-
-  // Test the named parameters
-  {
-    // Test computation of defaults
-    typedef boost::iterator_adaptor<int*, boost::default_iterator_policies,
-      boost::value_type_is<int> > Iter1;
-    // don't use std::iterator_traits here to avoid VC++ problems
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::value_type, int>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::reference, int&>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::pointer, int*>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::difference_type, std::ptrdiff_t>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::iterator_category, std::random_access_iterator_tag>::value));
-  }
-  {  
-    // Test computation of default when the Value is const
-    typedef boost::iterator_adaptor<std::list<int>::iterator,
-      boost::default_iterator_policies,
-      boost::value_type_is<const int> > Iter1;
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::value_type, int>::value));
-#if defined(__BORLANDC__) || defined(BOOST_MSVC)
-    // We currently don't know how to workaround this bug.
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::reference, int&>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::pointer, int*>::value));
-#else
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::reference, const int&>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::pointer, const int*>::value));
-#endif
-  }
-  {
-    // Test with no defaults
-    typedef boost::iterator_adaptor<int*, boost::default_iterator_policies,
-      boost::reference_is<long>,
-      boost::pointer_is<float*>,
-      boost::value_type_is<char>,
-      boost::iterator_category_is<std::input_iterator_tag>,
-      boost::difference_type_is<int>
-    > Iter1;
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::value_type, char>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::reference, long>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::pointer, float*>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::difference_type, int>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<Iter1::iterator_category, std::input_iterator_tag>::value));
-  }
-  
-  // Test the iterator_adaptor
-  {
-    boost::iterator_adaptor<dummyT*, boost::default_iterator_policies, dummyT> i(array);
-    boost::random_access_iterator_test(i, N, array);
-    
-    boost::iterator_adaptor<const dummyT*, boost::default_iterator_policies, const dummyT> j(array);
-    boost::random_access_iterator_test(j, N, array);
-    boost::const_nonconst_iterator_test(i, ++j);
-  }
-
-  // Test projection_iterator_pair_generator
-  {    
-    typedef std::pair<dummyT,dummyT> Pair;
-    Pair pair_array[N];
-    for (int k = 0; k < N; ++k)
-      pair_array[k].first = array[k];
-
-    typedef boost::projection_iterator_pair_generator<select1st_<Pair>,
-      Pair*, const Pair*
-      > Projection;
-    
-    Projection::iterator i(pair_array);
-    boost::random_access_iterator_test(i, N, array);
-
-    boost::random_access_iterator_test(boost::make_projection_iterator(pair_array, select1st_<Pair>()), N, array);    
-    boost::random_access_iterator_test(boost::make_projection_iterator< select1st_<Pair> >(pair_array), N, array);    
-
-    Projection::const_iterator j(pair_array);
-    boost::random_access_iterator_test(j, N, array);
-
-    boost::random_access_iterator_test(boost::make_const_projection_iterator(pair_array, select1st_<Pair>()), N, array);
-    boost::random_access_iterator_test(boost::make_const_projection_iterator<select1st_<Pair> >(pair_array), N, array);
-
-    boost::const_nonconst_iterator_test(i, ++j);
-  }
-
-  // Test reverse_iterator_generator
-  {
-    dummyT reversed[N];
-    std::copy(array, array + N, reversed);
-    std::reverse(reversed, reversed + N);
-    
-    typedef boost::reverse_iterator_generator<dummyT*
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-        , dummyT
-#endif
-      >::type reverse_iterator;
-    
-    reverse_iterator i(reversed + N);
-    boost::random_access_iterator_test(i, N, array);
-
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-    boost::random_access_iterator_test(boost::make_reverse_iterator(reversed + N), N, array);
-#endif
-
-    typedef boost::reverse_iterator_generator<const dummyT*
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-      , dummyT, const dummyT&, const dummyT
-#endif
-      >::type const_reverse_iterator;
-    
-    const_reverse_iterator j(reversed + N);
-    boost::random_access_iterator_test(j, N, array);
-
-    const dummyT* const_reversed = reversed;
-    
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-    boost::random_access_iterator_test(boost::make_reverse_iterator(const_reversed + N), N, array);
-#endif
-    
-    boost::const_nonconst_iterator_test(i, ++j);    
-  }
-
-  // Test reverse_iterator_generator again, with traits fully deducible on all platforms
-  {
-    std::deque<dummyT> reversed_container;
-    std::reverse_copy(array, array + N, std::back_inserter(reversed_container));
-    const std::deque<dummyT>::iterator reversed = reversed_container.begin();
-
-
-    typedef boost::reverse_iterator_generator<
-        std::deque<dummyT>::iterator>::type reverse_iterator;
-    typedef boost::reverse_iterator_generator<
-        std::deque<dummyT>::const_iterator, const dummyT>::type const_reverse_iterator;
-
-    // MSVC/STLport gives an INTERNAL COMPILER ERROR when any computation
-    // (e.g. "reversed + N") is used in the constructor below.
-    const std::deque<dummyT>::iterator finish = reversed_container.end();
-    reverse_iterator i(finish);
-    
-    boost::random_access_iterator_test(i, N, array);
-    boost::random_access_iterator_test(boost::make_reverse_iterator(reversed + N), N, array);
-
-    const_reverse_iterator j = reverse_iterator(finish);
-    boost::random_access_iterator_test(j, N, array);
-
-    const std::deque<dummyT>::const_iterator const_reversed = reversed;
-    boost::random_access_iterator_test(boost::make_reverse_iterator(const_reversed + N), N, array);
-    
-    // Many compilers' builtin deque iterators don't interoperate well, though
-    // STLport fixes that problem.
-#if defined(__SGI_STL_PORT) || !defined(__GNUC__) && !defined(__BORLANDC__) && !defined(BOOST_MSVC)
-    boost::const_nonconst_iterator_test(i, ++j);
-#endif
-  }
-  
-  // Test integer_range's iterators
-  {
-    int int_array[] = { 0, 1, 2, 3, 4, 5 };
-    boost::integer_range<int> r(0, 5);
-    boost::random_access_iterator_test(r.begin(), r.size(), int_array);
-  }
-
-  // Test filter iterator
-  {
-    // Using typedefs for filter_gen::type confused Borland terribly.
-    typedef boost::detail::non_bidirectional_category<dummyT*>::type category;
-    
-    typedef boost::filter_iterator_generator<one_or_four, dummyT*
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-        , dummyT
-#endif
-        >::type filter_iter;
-
-#if defined(__BORLANDC__)
-    // Borland is choking on accessing the policies_type explicitly
-    // from the filter_iter. 
-    boost::forward_iterator_test(make_filter_iterator(array, array+N, 
-                                                      one_or_four()),
-                                 dummyT(1), dummyT(4));
-#else
-    filter_iter i(array, filter_iter::policies_type(one_or_four(), array + N));
-    boost::forward_iterator_test(i, dummyT(1), dummyT(4));
-#endif
-
-#if !defined(__BORLANDC__)
-    // 
-    enum { is_forward = boost::is_same<
-           filter_iter::iterator_category,
-           std::forward_iterator_tag>::value };
-    BOOST_STATIC_ASSERT(is_forward);
-#endif
-
-    // On compilers not supporting partial specialization, we can do more type
-    // deduction with deque iterators than with pointers... unless the library
-    // is broken ;-(
-#if !defined(BOOST_MSVC) || defined(__SGI_STL_PORT)
-    std::deque<dummyT> array2;
-    std::copy(array+0, array+N, std::back_inserter(array2));
-    boost::forward_iterator_test(
-        boost::make_filter_iterator(array2.begin(), array2.end(), one_or_four()),
-        dummyT(1), dummyT(4));
-
-    boost::forward_iterator_test(
-        boost::make_filter_iterator<one_or_four>(array2.begin(), array2.end()),
-        dummyT(1), dummyT(4));
-#endif
-
-#if !defined(BOOST_MSVC) // This just freaks MSVC out completely
-    boost::forward_iterator_test(
-        boost::make_filter_iterator<one_or_four>(
-            boost::make_reverse_iterator(array2.end()),
-            boost::make_reverse_iterator(array2.begin())
-            ),
-        dummyT(4), dummyT(1));
-#endif
-    
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-    boost::forward_iterator_test(
-        boost::make_filter_iterator(array+0, array+N, one_or_four()),
-        dummyT(1), dummyT(4));
-
-    boost::forward_iterator_test(
-        boost::make_filter_iterator<one_or_four>(array, array + N),
-        dummyT(1), dummyT(4));
-
-#endif
-  }
-
-  // check operator-> with a forward iterator
-  {
-    boost::forward_iterator_archetype<dummyT> forward_iter;
-#if defined(__BORLANDC__)
-    typedef boost::iterator_adaptor<boost::forward_iterator_archetype<dummyT>,
-      boost::default_iterator_policies,
-      dummyT, const dummyT&, const dummyT*, 
-      std::forward_iterator_tag, std::ptrdiff_t> adaptor_type;
-#else
-    typedef boost::iterator_adaptor<boost::forward_iterator_archetype<dummyT>,
-      boost::default_iterator_policies,
-      boost::reference_is<const dummyT&>,
-      boost::pointer_is<const dummyT*> ,
-      boost::iterator_category_is<std::forward_iterator_tag>,
-      boost::value_type_is<dummyT>,
-      boost::difference_type_is<std::ptrdiff_t>
-    > adaptor_type;
-#endif
-    adaptor_type i(forward_iter);
-    int zero = 0;
-    if (zero) // don't do this, just make sure it compiles
-      assert((*i).m_x == i->foo());      
-  }
-  // check operator-> with an input iterator
-  {
-    boost::input_iterator_archetype<dummyT> input_iter;
-    typedef boost::iterator_adaptor<boost::input_iterator_archetype<dummyT>,
-      boost::default_iterator_policies,
-      dummyT, const dummyT&, const dummyT*, 
-      std::input_iterator_tag, std::ptrdiff_t> adaptor_type;
-    adaptor_type i(input_iter);
-    int zero = 0;
-    if (zero) // don't do this, just make sure it compiles
-      assert((*i).m_x == i->foo());      
-  }
-
-  {
-    // check generator_iterator
-    my_gen g1;
-    boost::generator_iterator_generator<my_gen>::type gen =
-      boost::make_generator_iterator(g1);
-    assert(*gen == 1);
-    ++gen;
-    gen++;
-    assert(*gen == 3);
-  }
-
-  {
-    // check permutation_iterator
-    typedef std::deque< int > element_range_type;
-    typedef std::list< int > index_type;
-    
-    static const int element_range_size = 10;
-    static const int index_size = 4;
-    
-    element_range_type elements( element_range_size );
-    
-    for(element_range_type::iterator el_it = elements.begin();
-        el_it != elements.end();
-        ++el_it)
-    {
-        *el_it = std::distance( elements.begin(), el_it );
-    }
-    
-    index_type indices( index_size );
-    
-    for(index_type::iterator i_it = indices.begin();
-        i_it != indices.end();
-        ++i_it)
-    {
-        *i_it = element_range_size - index_size
-            + std::distance(indices.begin(), i_it );
-    }
-    
-    std::reverse( indices.begin(), indices.end() );
-    
-    typedef boost::permutation_iterator_generator< element_range_type::iterator, index_type::iterator >::type permutation_type;
-    permutation_type begin = boost::make_permutation_iterator( elements.begin(), indices.begin() );
-    permutation_type end = boost::make_permutation_iterator( elements.begin(), indices.end() );
-
-    int expected_outcome[] = { 9, 8, 7, 6 };
-    assert( std::equal( begin, end, expected_outcome ) );
-  }
-
-  std::cout << "test successful " << std::endl;
-  return 0;
-}
--- a/iterator_adaptors.htm
+++ b/iterator_adaptors.htm
@ -1,954 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-    <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-    <meta name="ProgId" content="FrontPage.Editor.Document">
-
-    <title>Boost Iterator Adaptor Library</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-    <img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" align=
-    "center" width="277" height="86"> 
-
-    <h1>Boost Iterator Adaptor Library</h1>
-
-    <h2>Introduction</h2>
-
-    <p>The Iterator Adaptor library allows you transform an arbitrary ``base''
-    type into a standard-conforming iterator with the behaviors you choose.
-    Doing so is especially easy if the ``base'' type is itself an iterator. The
-    library also supplies several example <a href=
-    "../../more/generic_programming.html#adaptors">adaptors</a> which apply
-    specific useful behaviors to arbitrary base iterators.
-
-    <h2>Backward Compatibility Note</h2>
-
-    <p>The library's interface has changed since it was first released, breaking
-    backward compatibility:
-
-    <ol>
-
-    <li><a href="#policies">Policies classes</a> now operate on instances of the
-    whole <tt>iterator_adaptor</tt> object, rather than just operating on the
-    <tt>Base</tt> object. This change not only gives the policies class access
-    to both members of a pair of interacting iterators, but also eliminates the
-    need for the ugly <tt>type&lt;Reference&gt;</tt> and
-    <tt>type&lt;Difference&gt;</tt> parameters to various policy functions.
-
-    <li>The <a href="#named_template_parameters">Named Template Parameter</a>
-    interface has been made simpler, easier to use, and compatible with more
-    compilers.
-
-    </ol>
-
-    <h2>Other Documentation</h2>
-
-    <p><a href="iterator_adaptors.pdf">``Policy Adaptors and the Boost Iterator
-    Adaptor Library''</a> is a technical paper describing this library and the
-    powerful design pattern on which it is based. It was presented at the <a
-    href="http://www.oonumerics.org/tmpw01">C++ Template Workshop</a> at OOPSLA
-    2001; the slides from the talk are available <a
-    href="iterator_adaptors.ppt">here</a>. Please note that while the slides
-    incorporate the minor interface changes described in the previous section,
-    the paper does not.
-
-    <h2>Table of Contents</h2>
-
-    <ul>
-      <li>
-        Header <tt><a href=
-        "../../boost/iterator_adaptors.hpp">boost/iterator_adaptors.hpp</a></tt>
-        
-
-        <ul>
-          <li>
-            Generalized Iterator Adaptor 
-
-            <ul>
-              <li>Class template <tt><a href=
-              "#iterator_adaptor">iterator_adaptor</a></tt>
-
-              <li><a href="#template_parameters">Template Parameters</a>
-
-              <li><a href="#named_template_parameters">Named Template Parameters</a>
-
-              <li><a href="#policies">The Policies Class</a>
-
-              <li><a href="#additional_members">Additional Class Members</a>
-
-              <li><a href="#example">Example</a>
-
-              <li>(<tt>const</tt>/non-<tt>const</tt>) <a href=
-              "#iterator_interactions">Iterator Interactions</a>
-
-              <li><a href="#challenge">Challenge</a>
-
-              <li><a href="#concept_model">Concept Model</a>
-
-              <li><a href="#declaration_synopsis">Declaration Synopsis</a>
-
-              <li><a href="#portability">Portability</a>
-
-              <li><a href="#notes">Notes</a>
-            </ul>
-
-          <li>
-            <a name="specialized_adaptors">Specialized Iterator Adaptors</a> 
-
-            <ul>
-              <li><a href="indirect_iterator.htm">Indirect Iterator Adaptor</a>
-
-              <li><a href="reverse_iterator.htm">Reverse Iterator Adaptor</a>
-
-              <li><a href="transform_iterator.htm">Transform Iterator
-              Adaptor</a>
-
-              <li><a href="projection_iterator.htm">Projection Iterator
-              Adaptor</a>
-
-              <li><a href="filter_iterator.htm">Filter Iterator Adaptor</a>
-            </ul>
-        </ul>
-
-      <li>Header <tt><a href=
-      "../../boost/counting_iterator.hpp">boost/counting_iterator.hpp</a></tt><br>
-
-       <a href="counting_iterator.htm">Counting Iterator Adaptor</a>
-
-      <li>Header <tt><a href=
-      "../../boost/function_output_iterator.hpp">boost/function_output_iterator.hpp</a></tt><br>
-
-       <a href="function_output_iterator.htm">Function Output Iterator Adaptor</a>
-      <li>Header <tt><a href="../../boost/generator_iterator.hpp">boost/generator_iterator.hpp</a></tt><br>
-       <a href="generator_iterator.htm">Generator Iterator Adaptor</a>
-      <li>Header <tt><a href="../../boost/permutation_iterator.hpp">boost/permutation_iterator.hpp</a></tt><br>
-       <a href="permutation_iterator.htm">Permutation Iterator Adaptor</a>
-    </ul>
-
-    <p><b><a href="../../people/dave_abrahams.htm">Dave
-    Abrahams</a></b> started the library, applying <a href=
-    "../../more/generic_programming.html#policy">policy class</a> technique and
-    handling const/non-const iterator interactions. He also contributed the
-    <tt><a href="indirect_iterator.htm">indirect_</a></tt> and <tt><a href=
-    "reverse_iterator.htm">reverse_</a></tt> iterator generators, and expanded
-    <tt><a href="counting_iterator.htm">counting_iterator_generator</a></tt> to
-    cover all incrementable types. He edited most of the documentation,
-    sometimes heavily.<br>
-     <b><a href="../../people/jeremy_siek.htm">Jeremy
-    Siek</a></b> contributed the <a href="transform_iterator.htm">transform
-    iterator</a> adaptor, the integer-only version of <tt><a href=
-    "counting_iterator.htm">counting_iterator_generator</a></tt>, 
-    the <a href="function_output_iterator.htm">function output iterator</a> 
-    adaptor, and most of the documentation.<br>
-     <b><a href="http://www.boost.org/people/john_potter.htm">John
-    Potter</a></b> contributed the <tt><a href=
-    "projection_iterator.htm">projection_</a></tt> and <tt><a href=
-    "filter_iterator.htm">filter_</a></tt> iterator generators and made some
-    simplifications to the main <tt><a href=
-    "#iterator_adaptor">iterator_adaptor</a></tt> template.<br>
-    <b><a href="../../people/jens_maurer.htm">Jens Maurer</a></b>
-    contributed the <a href="generator_iterator.htm">generator iterator</a>
-    adaptor.<br>
-    Toon Knapen contributed the <a href="permutation_iterator.htm">permutation
-    iterator</a> adaptor.<br>
-
-    <h2><a name="iterator_adaptor">Class template</a>
-    <tt>iterator_adaptor</tt></h2>
-    Implementing standard conforming iterators is a non-trivial task. There are
-    some fine points such as the interactions between an iterator and its
-    corresponding const_iterator, and there are myriad operators that should be
-    implemented but are easily forgotten or mishandled, such as
-    <tt>operator-&gt;()</tt>. Using <tt>iterator_adaptor</tt>, you can easily
-    implement an iterator class, and even more easily extend and <a href=
-    "../../more/generic_programming.html#adaptors">adapt</a> existing iterator
-    types. Moreover, it is easy to make a pair of interoperable <tt>const</tt>
-    and <tt>non-const</tt> iterators. 
-
-    <p><tt>iterator_adaptor</tt> is declared like this:
-<pre>
-template &lt;class Base, class Policies, 
-    class ValueOrNamedParam = typename std::iterator_traits&lt;Base&gt;::value_type,
-    class ReferenceOrNamedParam = <i>...(see below)</i>,
-    class PointerOrNamedParam = <i>...(see below)</i>,
-    class CategoryOrNamedParam = typename std::iterator_traits&lt;Base&gt;::iterator_category,
-    class DistanceOrNamedParam = typename std::iterator_traits&lt;Base&gt;::difference_type&gt;
-struct iterator_adaptor;
-</pre>
-
-    <h3><a name="template_parameters">Template Parameters</a></h3>
-
-    <p>Although <tt>iterator_adaptor</tt> takes seven template parameters,
-    defaults have been carefully chosen to minimize the number of parameters
-    you must supply in most cases, especially if <tt>BaseType</tt> is an
-    iterator.
-
-    <table border="1" summary="iterator_adaptor template parameters">
-      <tr>
-        <th>Parameter
-
-        <th>Description
-
-      <tr>
-        <td><tt>BaseType</tt> 
-
-        <td>The type being wrapped.
-
-      <tr>
-        <td><tt>Policies</tt> 
-
-        <td>A <a href="../../more/generic_programming.html#policy">policy
-        class</a> that supplies core functionality to the resulting iterator. A
-        detailed description can be found <a href="#policies">below</a>.
-
-      <tr>
-        <td><tt>Value</tt> 
-
-        <td>The <tt>value_type</tt> of the resulting iterator, unless const. If
-        Value is <tt>const X</tt> the
-        <tt>value_type</tt> will be (<i>non-</i><tt>const</tt>) <tt>X</tt><a href=
-        "#1">[1]</a>. If the <tt>value_type</tt> you wish to use is an abstract
-        base class see note <a href="#5">[5]</a>.<br>
-         <b>Default:</b>
-        <tt>std::iterator_traits&lt;BaseType&gt;::value_type</tt> <a href=
-        "#2">[2]</a>
-
-      <tr>
-        <td><tt>Reference</tt> 
-
-        <td>The <tt>reference</tt> type of the resulting iterator, and in
-        particular, the result type of <tt>operator*()</tt>.<br>
-         <b>Default:</b> If <tt>Value</tt> is supplied, <tt>Value&amp;</tt> is
-        used. Otherwise
-        <tt>std::iterator_traits&lt;BaseType&gt;::reference</tt> is used. <a href="#7">[7]</a>
-
-      <tr>
-        <td><tt>Pointer</tt> 
-
-        <td>The <tt>pointer</tt> type of the resulting iterator, and in
-        particular, the result type of <tt>operator-&gt;()</tt>.<br>
-         <b>Default:</b> If <tt>Value</tt> was supplied, then <tt>Value*</tt>,
-        otherwise <tt>std::iterator_traits&lt;BaseType&gt;::pointer</tt>. <a href="#7">[7]</a>
-
-      <tr>
-        <td><tt>Category</tt> 
-
-        <td>The <tt>iterator_category</tt> type for the resulting iterator.<br>
-         <b>Default:</b>
-        <tt>std::iterator_traits&lt;BaseType&gt;::iterator_category</tt> 
-
-      <tr>
-        <td><tt>Distance</tt> 
-
-        <td>The <tt>difference_type</tt> for the resulting iterator.<br>
-         <b>Default:</b>
-        <tt>std::iterator_traits&lt;BaseType&gt;::difference_type</tt> 
-
-      <tr>
-         <td><tt>NamedParam</tt>
-
-         <td>A named template parameter (see below).
-    </table>
-
-    <h3><a name="named_template_parameters">Named Template Parameters</a></h3>
-    
-    With seven template parameters, providing arguments for
-    <tt>iterator_adaptor</tt> in the correct order can be challenging.
-    Also, often times one would like to specify the sixth or seventh
-    template parameter, but use the defaults for the third through
-    fifth. As a solution to these problems we provide a mechanism for
-    naming the last five template parameters, and providing them in
-    any order through a set of named template parameters. The following
-    classes are provided for specifying the parameters. Any of these
-    classes can be used for any of the last five template parameters
-    of <tt>iterator_adaptor</tt>.
-    <blockquote>
-<pre>
-template &lt;class Value&gt; struct value_type_is;
-template &lt;class Reference&gt; struct reference_is;
-template &lt;class Pointer&gt; struct pointer_is;
-template &lt;class Distance&gt; struct difference_type_is;
-template &lt;class Category&gt; struct iterator_category_is;
-</pre>
-    </blockquote>
-
-    For example, the following adapts <tt>foo_iterator</tt> to create
-    an <a href=
-    "http://www.sgi.com/tech/stl/InputIterator.html">InputIterator</a>
-    with <tt>reference</tt> type <tt>foo</tt>, and whose other traits
-    are determined according to the defaults described <a
-    href="#template_parameters">above</a>.
-
-    <blockquote>
-<pre>
-typedef iterator_adaptor&lt;foo_iterator, foo_policies,
-  reference_is&lt;foo&gt;, iterator_category_is&lt;std::input_iterator_tag&gt;
-  &gt; MyIterator;
-</pre>
-    </blockquote>
-
-    
-    <h3><a name="policies">The Policies Class</a></h3>
-
-    <p>The main task in using <tt>iterator_adaptor</tt> is creating an
-    appropriate <tt>Policies</tt> class. The <tt>Policies</tt> class will become
-    the functional heart of the resulting iterator, supplying the core
-    operations that determine its behavior. The <tt>iterator_adaptor</tt>
-    template defines all of the operators required of a <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access
-    Iterator</a> by dispatching to a <tt>Policies</tt> object. Your
-    <tt>Policies</tt> class must implement a subset of the core iterator
-    operations below corresponding to the iterator categories you want it to
-    support.<br>
-    <br>
-    
-
-    <table border="1" summary="iterator_adaptor Policies operations">
-      <caption>
-        <b>Policies Class Requirements</b><br>
-        <tt><b>T</b></tt>: adapted iterator type; <tt><b>x, y</b></tt>: objects of type
-        T; <tt><b>p</b></tt>: <tt>T::policies_type</tt>
-         <tt><b>d</b></tt>:
-        <tt>T::difference_type</tt>; <tt><b>i1</b></tt>, <tt><b>i2</b></tt>:
-        <tt>T::base_type</tt>
-      </caption>
-
-      <tr>
-        <th>Expression
-
-        <th>Effects
-
-        <th>Implements Operations
-
-        <th>Required for Iterator Categories
-
-      <tr>
-        <td nowrap><tt>p.initialize(b)</tt>
-
-        <td>optionally modify base iterator during iterator construction
-
-        <td>constructors
-
-        <td rowspan="4"><a href=
-        "http://www.sgi.com/tech/stl/InputIterator.html">Input</a>/ <a href=
-        "http://www.sgi.com/tech/stl/OutputIterator.html">Output</a>/ <a href=
-        "http://www.sgi.com/tech/stl/ForwardIterator.html">Forward</a>/ <a
-        href=
-        "http://www.sgi.com/tech/stl/BidirectionalIterator.html">Bidirectional</a>/
-        <a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random&nbsp;Access</a> 
-
-	  
-      <tr>
-        <td nowrap><tt>p.dereference(x)</tt>
-
-        <td>returns an element of the iterator's <tt>reference</tt> type
-        
-        <td><tt>*x</tt>, <tt>x[d]</tt>
-
-
-      <tr>
-        <td nowrap><tt>p.equal(x, y)</tt> 
-
-        <td>tests the iterator for equality
-
-        <td><tt>i1&nbsp;==&nbsp;i2</tt>, <tt>i1&nbsp;!=&nbsp;i2</tt>
-
-      <tr>
-        <td nowrap><tt>p.increment(x)</tt> 
-
-        <td>increments the iterator
-
-        <td><tt>++p</tt>, <tt>p++</tt>
-
-      <tr>
-        <td nowrap><tt>p.decrement(x)</tt> 
-
-        <td>decrements the iterator
-
-        <td><tt>--x</tt>, <tt>x--</tt>
-
-        <td><a href=
-        "http://www.sgi.com/tech/stl/BidirectionalIterator.html">Bidirectional</a>/
-        <a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random&nbsp;Access</a> 
-
-      <tr>
-        <td nowrap><tt>p.distance(x, y)</tt> 
-
-        <td>measures the distance between iterators
-
-        <td><tt>y&nbsp;-&nbsp;x</tt>, <tt>x&nbsp;&lt;&nbsp;y</tt>
-
-       <td rowspan="2"><a href=
-         "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-         Access</a> 
-
-      <tr>
-        <td nowrap><tt>p.advance(x, n)</tt> 
-
-        <td>adds an integer offset to iterators
-
-        <td>
-<tt>x&nbsp;+&nbsp;d</tt>,
-<tt>d&nbsp;+&nbsp;x</tt>,
-
-<br>
-<tt>x&nbsp;+=&nbsp;d</tt>,
-<tt>x&nbsp;-&nbsp;d</tt>,<br>
-<tt>x&nbsp;-=&nbsp;d</tt>
-        
-    </table>
-
-    <p>The library also supplies a "trivial" policy class,
-    <tt>default_iterator_policies</tt>, which implements all seven of the core
-    operations in the usual way. If you wish to create an iterator adaptor that
-    only changes a few of the base type's behaviors, then you can derive your
-    new policy class from <tt>default_iterator_policies</tt> to avoid retyping
-    the usual behaviors. You should also look at
-    <tt>default_iterator_policies</tt> as the ``boilerplate'' for your own
-    policy classes, defining functions with the same interface. This is the
-    definition of <tt>default_iterator_policies</tt>:<br>
-    <br>
-
-    <blockquote>
-<pre>
-struct <a name="default_iterator_policies">default_iterator_policies</a>
-{
-    // Some of these members were defined static, but Borland got confused
-    // and thought they were non-const. Also, Sun C++ does not like static
-    // function templates.
-
-    template &lt;class Base&gt;
-    void initialize(Base&amp;)
-        { }
-
-    template &lt;class IteratorAdaptor&gt;
-    typename IteratorAdaptor::reference dereference(const IteratorAdaptor&amp; x) const
-        { return *x.base(); }
-
-    template &lt;class IteratorAdaptor&gt;
-    void increment(IteratorAdaptor&amp; x)
-        { ++x.base(); }
-
-    template &lt;class IteratorAdaptor&gt;
-    void decrement(IteratorAdaptor&amp; x)
-        { --x.base(); }
-
-    template &lt;class IteratorAdaptor, class DifferenceType&gt;
-    void advance(IteratorAdaptor&amp; x, DifferenceType n)
-        { x.base() += n; }
-
-    template &lt;class IteratorAdaptor1, class IteratorAdaptor2&gt;
-    typename IteratorAdaptor1::difference_type
-    distance(const IteratorAdaptor1&amp; x, const IteratorAdaptor2&amp; y) const
-        { return y.base() - x.base(); }
-
-    template &lt;class IteratorAdaptor1, class IteratorAdaptor2&gt;
-    bool equal(const IteratorAdaptor1&amp; x, const IteratorAdaptor2&amp; y) const
-        { return x.base() == y.base(); }
-};
-</pre></blockquote>
-
-    <p>Template member functions are used throughout
-    <tt>default_iterator_policies</tt> so that it can be employed with a wide
-    range of iterators. If we had used concrete types above, we'd have tied the
-    usefulness of <tt>default_iterator_policies</tt> to a particular range of
-    adapted iterators. If you follow the same pattern with your
-    <tt>Policies</tt> classes, you can use them to generate more specialized
-    adaptors along the lines of <a href="#specialized_adaptors">those supplied by this library</a>.
-
-    <h3><a name="additional_members">Additional Members</a></h3>
-    In addition to all of the member functions required of a <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access
-    Iterator</a>, the <tt>iterator_adaptor</tt> class template defines the
-    following members. <br>
-     <br>
-     
-
-    <table border="1" summary="additional iterator_adaptor members">
-      <tr>
-        <td><tt>explicit iterator_adaptor(const Base&amp;, const Policies&amp; =
-        Policies())</tt>
-         <br><br>
-         Construct an adapted iterator from a base object and a policies
-         object. As this constructor is <tt>explicit</tt>, it does not
-         provide for implicit conversions from the <tt>Base</tt> type to
-         the iterator adaptor.
-
-      <tr>
-        <td><tt>template &lt;class B, class V, class R, class P&gt;<br>
-         iterator_adaptor(const
-        iterator_adaptor&lt;B,Policies,V,R,P,Category,Distance&gt;&amp;)</tt>
-        <br><br>
-         This constructor allows for conversion from mutable to
-        constant adapted iterators. See <a href=
-        "#iterator_interactions">below</a> for more details.<br>
-         Requires: <tt>B</tt> is convertible to <tt>Base</tt>.
-
-      <tr>
-        <td><tt>const base_type& base() const;</tt>
-           <br><br>
-         Return a const reference to the base object.
-
-      <tr>        <td><tt>base_type& base();</tt>
-         <br><br>
-         Return a reference to the base object. This is to give the policies object
-         access to the base object. See <a href="#policies">above</a> for policies
-         iterator_adaptor interaction.<a href="#8">[8]</a>
-    </table>
-
-    <h3><a name="example">Example</a></h3>
-
-    <p>It is often useful to automatically apply some function to the value
-    returned by dereferencing an iterator. The <a href=
-    "./transform_iterator.htm">transform iterator</a> makes it easy to create
-    an iterator adaptor which does just that. Here we will show how easy it is
-    to implement the transform iterator using the <tt>iterator_adaptor</tt>
-    template.
-
-    <p>We want to be able to adapt a range of iterators and functions, so the
-    policies class will have a template parameter for the function type and it
-    will have a data member of that type. We know that the function takes one
-    argument and that we'll need to be able to deduce the <tt>result_type</tt>
-    of the function so we can use it for the adapted iterator's
-    <tt>value_type</tt>. <a href=
-    "http://www.sgi.com/Technology/STL/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>
-    is the <a href="../../more/generic_programming.html#concept">Concept</a>
-    that fulfills those requirements.
-
-    <p>To implement a transform iterator we will only change one of the base
-    iterator's behaviors, so the <tt>transform_iterator_policies</tt> class can
-    inherit the rest from <tt>default_iterator_policies</tt>. We will define the
-    <tt>dereference()</tt> member function, which is used to implement
-    <tt>operator*()</tt> of the adapted iterator. The implementation will
-    dereference the base iterator and apply the function object. The complete
-    code for <tt>transform_iterator_policies</tt> is:<br>
-    <br>
-
-<blockquote><pre>
-template &lt;class AdaptableUnaryFunction&gt;
-struct transform_iterator_policies : public default_iterator_policies
-{
-    transform_iterator_policies() { }
-
-    transform_iterator_policies(const AdaptableUnaryFunction&amp; f)
-        : m_f(f) { }
-    
-    template &lt;class IteratorAdaptor&gt;
-    typename IteratorAdaptor::reference
-    dereference(const IteratorAdaptor&amp; iter) const
-        { return m_f(*iter.base()); }
-
-    AdaptableUnaryFunction m_f;
-};
-
-</pre></blockquote>
-
-    <p>The next step is to use the <tt>iterator_adaptor</tt> template to
-    construct the transform iterator type. The nicest way to package the
-    construction of the transform iterator is to create a <a href=
-    "../../more/generic_programming.html#type_generator">type generator</a>.
-    The first template parameter to the generator will be the type of the
-    function object and the second will be the base iterator type. We use
-    <tt>iterator_adaptor</tt> to define the transform iterator type as a nested
-    <tt>typedef</tt> inside the <tt>transform_iterator_generator</tt> class.
-    Because the function may return by-value, we must limit the
-    <tt>iterator_category</tt> to <a href=
-    "http://www.sgi.com/tech/stl/InputIterator.html">Input Iterator</a>, and
-    the iterator's <tt>reference</tt> type cannot be a true reference (the
-    standard allows this for input iterators), so in this case we can use few
-    of <tt>iterator_adaptor</tt>'s default template arguments.<br>
-    <br>
-
-
-    <blockquote>
-<pre>
-template &lt;class AdaptableUnaryFunction, class Iterator&gt;
-struct transform_iterator_generator
-{
-    typedef typename AdaptableUnaryFunction::result_type value_type;
-public:
-    typedef iterator_adaptor&lt;Iterator, 
-        transform_iterator_policies&lt;AdaptableUnaryFunction&gt;,
-        value_type, value_type, value_type*, std::input_iterator_tag&gt;
-      type;
-};
-</pre>
-    </blockquote>
-
-    <p>As a finishing touch, we will create an <a href=
-    "../../more/generic_programming.html#object_generator">object generator</a>
-    for the transform iterator. Our object generator makes it more
-    convenient to create a transform iterator.<br>
-    <br>
-
-
-    <blockquote>
-<pre>
-template &lt;class AdaptableUnaryFunction, class Iterator&gt;
-typename transform_iterator_generator&lt;AdaptableUnaryFunction,Iterator&gt;::type
-make_transform_iterator(Iterator base,
-                        const AdaptableUnaryFunction&amp; f = AdaptableUnaryFunction())
-{
-    typedef typename transform_iterator_generator&lt;AdaptableUnaryFunction,
-      Iterator&gt;::type result_t;
-    return result_t(base, f);
-}
-</pre>
-    </blockquote>
-
-    <p>Here is an example that shows how to use a transform iterator to iterate
-    through a range of numbers, multiplying each of them by 2 and printing the
-    result to standard output.<br>
-    <br>
-
-
-    <blockquote>
-<pre>
-#include &lt;functional&gt;
-#include &lt;algorithm&gt;
-#include &lt;iostream&gt;
-#include &lt;boost/iterator_adaptors.hpp&gt;
-
-int main(int, char*[])
-{
-  int x[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
-  const int N = sizeof(x)/sizeof(int);
-  std::cout &lt;&lt; &quot;multiplying the array by 2:&quot; &lt;&lt; std::endl;
-  std::copy(boost::make_transform_iterator(x, std::bind1st(std::multiplies&lt;int&gt;(), 2)),
-      boost::make_transform_iterator(x + N, std::bind1st(std::multiplies&lt;int&gt;(), 2)),
-      std::ostream_iterator&lt;int&gt;(std::cout, &quot; &quot;));
-  std::cout &lt;&lt; std::endl;
-  return 0;
-}
-</pre>
-      This output is: 
-<pre>
-2 4 6 8 10 12 14 16
-</pre>
-    </blockquote>
-
-    <h3><a name="iterator_interactions">Iterator Interactions</a></h3>
-
-    <p>C++ allows <tt>const</tt> and non-<tt>const</tt> pointers to interact in
-    the following intuitive ways:
-
-    <ul>
-      <li>a non-<tt>const</tt> pointer to <tt>T</tt> can be implicitly
-      converted to a <tt>const</tt> pointer to <tt>T</tt>.
-
-      <li><tt>const</tt> and non-<tt>const</tt> pointers to <tt>T</tt> can be
-      freely mixed in comparison expressions.
-
-      <li><tt>const</tt> and non-<tt>const</tt> pointers to <tt>T</tt> can be
-      freely subtracted, in any order.
-    </ul>
-
-    Getting user-defined iterators to work together that way is nontrivial (see
-    <a href="reverse_iterator.htm#interactions">here</a> for an example of where
-    the C++ standard got it wrong), but <tt>iterator_adaptor</tt> can make it
-    easy. The rules are as follows:
-
-    <ul>
-      <li><a name="interoperable">Adapted iterators that share the same <tt>Policies</tt>,
-      <tt>Category</tt>, and <tt>Distance</tt> parameters are called
-      <i>interoperable</i>.</a>
-
-      <li>An adapted iterator can be implicitly converted to any other adapted
-      iterator with which it is interoperable, so long as the <tt>Base</tt>
-      type of the source iterator can be converted to the <tt>Base</tt> type of
-      the target iterator.
-
-      <li>Interoperable iterators can be freely mixed in comparison expressions
-      so long as the <tt>Policies</tt> class has <tt>equal</tt> (and, for
-      random access iterators, <tt>distance</tt>) members that can accept both
-      <tt>Base</tt> types in either order.
-
-      <li>Interoperable iterators can be freely mixed in subtraction
-      expressions so long as the <tt>Policies</tt> class has a
-      <tt>distance</tt> member that can accept both <tt>Base</tt> types in
-      either order.
-    </ul>
-
-    <h4>Example</h4>
-    
-    <p>The <a href="projection_iterator.htm">Projection Iterator</a> adaptor is similar to the <a
-href="./transform_iterator.htm">transform iterator adaptor</a> in that
-its <tt>operator*()</tt> applies some function to the result of
-dereferencing the base iterator and then returns the result. The
-difference is that the function must return a reference to some
-existing object (for example, a data member within the
-<tt>value_type</tt> of the base iterator). 
-
-    <p>
-The <a
-    href="projection_iterator.htm#projection_iterator_pair_generator">projection_iterator_pair_generator</a> template
-    is a special two-<a href="../../more/generic_programming.html#type_generator">type generator</a> for mutable and constant versions of a
-    projection iterator. It is defined as follows:
-<blockquote>
-<pre>
-template &lt;class AdaptableUnaryFunction, class Iterator, class ConstIterator&gt;
-struct projection_iterator_pair_generator {
-    typedef typename AdaptableUnaryFunction::result_type value_type;
-    typedef projection_iterator_policies&lt;AdaptableUnaryFunction&gt; policies;
-public:
-    typedef iterator_adaptor&lt;Iterator,policies,value_type&gt; iterator;
-    typedef iterator_adaptor&lt;ConstIterator,policies,value_type,
-        const value_type&amp;,const value_type*&gt; const_iterator;
-};
-</pre>
-</blockquote>
-
-<p>It is assumed that the <tt>Iterator</tt> and <tt>ConstIterator</tt> arguments are corresponding mutable
-and constant iterators. <ul>
-<li>
-Clearly, then, the
-<tt>projection_iterator_pair_generator</tt>'s <tt>iterator</tt> and
-<tt>const_iterator</tt> are <a href="#interoperable">interoperable</a>, since
-they share the same <tt>Policies</tt> and since <tt>Category</tt> and
-<tt>Distance</tt> as supplied by <tt>std::iterator_traits</tt> through the
-<a href="#template_parameters">default template parameters</a> to
-<tt>iterator_adaptor</tt> should be the same.
-
-<li>Since <tt>Iterator</tt> can presumably be converted to
-<tt>ConstIterator</tt>, the projection <tt>iterator</tt> will be convertible to
-the projection <tt>const_iterator</tt>.
-
-<li> Since <tt>projection_iterator_policies</tt> implements only the
-<tt>dereference</tt> operation, and inherits all other behaviors from
-<tt><a
-href="#default_iterator_policies">default_iterator_policies</a></tt>,
-which has fully-templatized <tt>equal</tt> and <tt>distance</tt>
-operations, the <tt>iterator</tt> and <tt>const_iterator</tt> can be
-freely mixed in comparison and subtraction expressions.
-
-</ul>
-
-    <h3><a name="challenge">Challenge</a></h3>
-
-    <p>There is an unlimited number of ways the <tt>iterator_adaptors</tt>
-    class can be used to create iterators. One interesting exercise would be to
-    re-implement the iterators of <tt>std::list</tt> and <tt>slist</tt>
-    using <tt>iterator_adaptors</tt>, where the adapted <tt>Iterator</tt> types
-    would be node pointers.
-
-    <h3><a name="concept_model">Concept Model</a></h3>
-    Depending on the <tt>Base</tt> and <tt>Policies</tt> template parameters,
-    an <tt>iterator_adaptor</tt> can be a <a href=
-    "http://www.sgi.com/tech/stl/InputIterator.html">Input Iterator</a>, <a
-    href="http://www.sgi.com/tech/stl/ForwardIterator.html">Forward
-    Iterator</a>, <a href=
-    "http://www.sgi.com/tech/stl/BidirectionalIterator.html">Bidirectional
-    Iterator</a>, or <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access
-    Iterator</a>. 
-
-    <h3><a name="declaration_synopsis">Declaration Synopsis</a></h3>
-<pre>
-template &lt;class Base, class Policies, 
-    class Value = typename std::iterator_traits&lt;Base&gt;::value_type,
-    class Reference = <i>...(see below)</i>,
-    class Pointer = <i>...(see below)</i>,
-    class Category = typename std::iterator_traits&lt;Base&gt;::iterator_category,
-    class Distance = typename std::iterator_traits&lt;Base&gt;::difference_type
-         &gt;
-struct iterator_adaptor
-{
-    typedef Distance difference_type;
-    typedef typename boost::remove_const&lt;Value&gt;::type value_type;
-    typedef Pointer pointer;
-    typedef Reference reference;
-    typedef Category iterator_category;
-    typedef Base base_type;
-    typedef Policies policies_type;
-
-    iterator_adaptor();
-    explicit iterator_adaptor(const Base&amp;, const Policies&amp; = Policies());
-
-    base_type&       base();
-    const base_type& base() const;
-
-    template &lt;class B, class V, class R, class P&gt;
-    iterator_adaptor(
-        const iterator_adaptor&lt;B,Policies,V,R,P,Category,Distance&gt;&amp;);
-
-    reference operator*() const; <a href="#6">[6]</a>
-    <i>operator_arrow_result_type</i> operator-&gt;() const; <a href=
-"#3">[3]</a>
-    <i>value_type</i> operator[](difference_type n) const; <a href="#3">[4]</a>, <a href="#6">[6]</a>
-
-    iterator_adaptor&amp; operator++();
-    iterator_adaptor&amp; operator++(int);
-    iterator_adaptor&amp; operator--();
-    iterator_adaptor&amp; operator--(int);
-
-    iterator_adaptor&amp; operator+=(difference_type n);
-    iterator_adaptor&amp; operator-=(difference_type n);
-
-    iterator_adaptor&amp; operator-(Distance x) const;
-};
-
-template &lt;class B, class P, class V, class R, class Ptr, 
-    class C, class D1, class D2&gt;
-iterator_adaptor&lt;B,P,V,R,Ptr,C,D1&gt;
-operator+(iterator_adaptor&lt;B,P,V,R,Ptr,C,D1&gt;, D2);
-
-template &lt;class B, class P, class V, class R, class Ptr,
-    class C, class D1, class D2&gt;
-iterator_adaptor&lt;B,P,V,R,P,C,D1&gt;
-operator+(D2, iterator_adaptor&lt;B,P,V,R,Ptr,C,D1&gt; p);
-
-template &lt;class B1, class B2, class P, class V1, class V2,
-    class R1, class R2, class P1, class P2, class C, class D&gt;
-Distance operator-(const iterator_adaptor&lt;B1,P,V1,R1,P1,C,D&gt;&amp;, 
-                   const iterator_adaptor&lt;B2,P,V2,R2,P2,C,D&gt;&amp;);
-
-template &lt;class B1, class B2, class P, class V1, class V2,
-    class R1, class R2, class P1, class P2, class C, class D&gt;
-bool operator==(const iterator_adaptor&lt;B1,P,V1,R1,P1,C,D&gt;&amp;, 
-                const iterator_adaptor&lt;B2,P,V2,R2,P2,C,D&gt;&amp;);
-
-// and similarly for operators !=, &lt;, &lt;=, &gt;=, &gt;
-</pre>
-
-    <h3><a name="portability">Portability</a></h3>
-
-    <p>Generally, the iterator adaptors library can be compiled with all compilers
-    supporting iterator traits and type traits.</p>
-
-    <p>Microsoft VC++ is not able to handle iterator adaptors based on a 
-    <code>vector<T>::iterator</code> without specifying all template paramters explicitly.
-    In case not all template parameters are specified explicitly, the iterator adaptors
-    library will deduce these types using iterator_traits. But since in VC++ a
-    <code>vector<T>::iterator</code> is a <code>T*</code>, VC++ can't handle using 
-    iterator_traits due to the lack of partial template specialization.</p> 
-    
-
-    <h3><a name="notes">Notes</a></h3>
-
-    <p><a name="1">[1]</a> The standard specifies that the <tt>value_type</tt>
-    of <tt>const</tt> iterators to <tt>T</tt> (e.g. <tt>const T*</tt>) is
-    <tt><i>non-</i>const T</tt>, while the <tt>pointer</tt> and
-    <tt>reference</tt> types for all <a href=
-    "http://www.sgi.com/tech/stl/ForwardIterator.html">Forward Iterators</a> are
-    <tt>const T*</tt> and <tt>const T&amp;</tt>, respectively. Stripping the
-    <tt>const</tt>-ness of <tt>Value</tt> allows you to easily make a constant
-    iterator by supplying a <tt>const</tt> type for <tt>Value</tt>, and allowing
-    the defaults for the <tt>Pointer</tt> and <tt>Reference</tt> parameters to
-    take effect. Although compilers that don't support partial specialization
-    won't strip <tt>const</tt> for you, having a <tt>const value_type</tt> is
-    often harmless in practice.
-
-    <p><a name="2">[2]</a> If your compiler does not support partial
-    specialization and the base iterator is a builtin pointer type, you
-    will not be able to use the default for <tt>Value</tt> and will have to
-    specify this type explicitly.
-
-    <p><a name="3">[3]</a> The result type for the <tt>operator-&gt;()</tt>
-    depends on the category and value type of the iterator and is somewhat
-    complicated to describe. But be assured, it works in a stardard conforming
-    fashion, providing access to members of the objects pointed to by the
-    iterator.
-
-    <p><a name="4">[4]</a> The result type of <tt>operator[]()</tt> is
-    <tt>value_type</tt> instead of <tt>reference</tt> as might be expected.
-    There are two reasons for this choice. First, the C++ standard only
-    requires that the return type of an arbitrary <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access
-    Iterator</a>'s <tt>operator[]</tt>be ``convertible to T'' (Table 76), so
-    when adapting an arbitrary base iterator we may not have a reference to
-    return. Second, and more importantly, for certain kinds of iterators,
-    returning a reference could cause serious memory problems due to the
-    reference being bound to a temporary object whose lifetime ends inside of
-    the <tt>operator[]</tt>.
-
-    <p><a name="5">[5]</a>
-    The <tt>value_type</tt> of an iterator may not be
-    an abstract base class, however many common uses of iterators
-    never need the <tt>value_type</tt>, only the <tt>reference</tt> type.
-    If you wish to create such an iterator adaptor, use a dummy
-    type such as <tt>char</tt> for the <tt>Value</tt> parameter,
-    and use a reference to your abstract base class for
-    the <tt>Reference</tt> parameter. Note that such an iterator
-    does not fulfill the C++ standards requirements for a
-    <a href= "http://www.sgi.com/tech/stl/ForwardIterator.html">
-    Forward Iterator</a>, so you will need to use a less restrictive
-    iterator category such as <tt>std::input_iterator_tag</tt>.
-
-    <p><a name="6">[6]</a>
-    There is a common misconception that an iterator should have two
-    versions of <tt>operator*</tt> and of <tt>operator[]</tt>, one
-    version that is a <tt>const</tt> member function and one version
-    that is non-<tt>const</tt>. Perhaps the source of this
-    misconception is that containers typically have const and
-    non-const versions of many of their member functions.  Iterators,
-    however, are different. A particular iterator type can be either
-    <i>mutable</i> or <i>constant</i> (but not both).  One can assign
-    to and change the object pointed to by a mutable iterator whereas a
-    constant iterator returns constant objects when dereferenced. Whether
-    the iterator object itself is <tt>const</tt> has nothing to do with
-    whether the iterator is mutable or constant.  This is analogous to
-    the way built-in pointer types behave.  For example, one can
-    modify objects pointed to by a <tt>const</tt> pointer
-<pre>
-    int* const x = new int;
-    int i = 3;
-    *x = i;
-</pre>
-    but one cannot modify objects pointed to by a pointer
-    to <tt>const</tt>
-<pre>
-    int const* x = new int;
-    int i = 3;
-    *x = i;
-</pre>
-
-    <p><a name="7">[7]</a>
-    If you are using a compiler that does not have a version of
-    <tt>std::iterator_traits</tt> that works for pointers (i.e., if your
-    compiler does not support partial specialization) then if the
-    <tt>Base</tt> type is a const pointer, then the correct defaults
-    for the <tt>reference</tt> and <tt>pointer</tt> types can not be
-    deduced. You must specify these types explicitly.
-    <p><a name="8">[8]</a>
-    Exposing the base object might be considered as being dangerous.
-    A possible fix would require compiler support for template friends. 
-    As this is not widely available today, the base object remains exposed for now.
-
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->30 Nov 2001<!--webbot bot="Timestamp" endspan i-checksum="15239" -->
-
-
-    <p>&copy; Copyright Dave Abrahams and Jeremy Siek 2001. Permission to copy,
-    use, modify, sell and distribute this document is granted provided this
-    copyright notice appears in all copies. This document is provided "as is"
-    without express or implied warranty, and with no claim as to its
-    suitability for any purpose. 
-
-</body>
-
-    <!--  LocalWords:  HTML html charset alt gif abrahams htm const iterator
-        incrementable david abrahams
-         -->
-     
-    <!--  LocalWords:  jeremy siek mishandled interoperable typename struct Iter iter src
-         -->
-     
-    <!--  LocalWords:  int bool ForwardIterator BidirectionalIterator BaseIterator
-         -->
-     
-    <!--  LocalWords:  RandomAccessIterator DifferenceType AdaptableUnaryFunction
-         -->
-     
-    <!--  LocalWords:  iostream hpp sizeof InputIterator constness ConstIterator
-         David Abrahams
-         -->
-<!--  LocalWords:  Iterators dereferenced
- -->
-</html>
-
--- a/iterator_adaptors.pdf
+++ b/iterator_adaptors.pdf
--- a/iterator_adaptors.ppt
+++ b/iterator_adaptors.ppt
--- a/iterator_traits_test.cpp
+++ b/iterator_traits_test.cpp
@ -1,4 +1,4 @@
-//  (C) Copyright David Abrahams 2001. Permission to copy, use, modify,
+//  (C) Copyright David Abrahams 2002. 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
@ -22,7 +22,7 @@
 //  19 Jan 2001 Initial version with iterator operators (David Abrahams)

 #include <boost/detail/iterator.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <boost/operators.hpp>
 #include <boost/static_assert.hpp>
 #include <iterator>
@ -31,6 +31,11 @@
 #include <cassert>
 #include <iostream>

+// A UDT for which we can specialize std::iterator_traits<element*> on
+// compilers which don't support partial specialization. There's no
+// other reasonable way to test pointers on those compilers.
+struct element {};
+
 // An iterator for which we can get traits.
 struct my_iterator1
    : boost::forward_iterator_helper<my_iterator1, char, long, const char*, const char&>
@ -77,42 +82,47 @@ struct my_iterator2
 struct my_iterator3 : my_iterator1
 {
    typedef int difference_type;
-    my_iterator3(const char* p) : my_iterator1(p) {}
+    my_iterator3(const char* p)
+        : my_iterator1(p) {}
 };

+//
+// Assertion tools.  Used instead of BOOST_STATIC_ASSERT because that
+// doesn't give us a nice stack backtrace
+//
+template <bool = false> struct assertion;
+
+template <> struct assertion<true>
+{
+    typedef char type;
+};
+
+template <class T, class U>
+struct assert_same
+    : assertion<(::boost::is_same<T,U>::value)>
+{
+};
+
+
+// Iterator tests
 template <class Iterator,
    class value_type, class difference_type, class pointer, class reference, class category>
 struct non_portable_tests
 {
-    // Unfortunately, the VC6 standard library doesn't supply these :(
-    BOOST_STATIC_ASSERT((
-        boost::is_same<
-        typename boost::detail::iterator_traits<Iterator>::pointer,
-        pointer
-        >::value));
-    
-    BOOST_STATIC_ASSERT((
-        boost::is_same<
-        typename boost::detail::iterator_traits<Iterator>::reference,
-        reference
-        >::value));
+    typedef typename boost::detail::iterator_traits<Iterator>::pointer test_pt;
+    typedef typename boost::detail::iterator_traits<Iterator>::reference test_rt;
+    typedef typename assert_same<test_pt, pointer>::type a1;
+    typedef typename assert_same<test_rt, reference>::type a2;
 };

 template <class Iterator,
    class value_type, class difference_type, class pointer, class reference, class category>
 struct portable_tests
 {
-    BOOST_STATIC_ASSERT((
-        boost::is_same<
-        typename boost::detail::iterator_traits<Iterator>::difference_type,
-        difference_type
-        >::value));
-    
-    BOOST_STATIC_ASSERT((
-        boost::is_same<
-        typename boost::detail::iterator_traits<Iterator>::iterator_category,
-        category
-        >::value));
+    typedef typename boost::detail::iterator_traits<Iterator>::difference_type test_dt;
+    typedef typename boost::detail::iterator_traits<Iterator>::iterator_category test_cat;
+    typedef typename assert_same<test_dt, difference_type>::type a1;
+    typedef typename assert_same<test_cat, category>::type a2;
 };

 // Test iterator_traits
@ -121,11 +131,8 @@ template <class Iterator,
 struct input_iterator_test
    : portable_tests<Iterator,value_type,difference_type,pointer,reference,category>
 {
-    BOOST_STATIC_ASSERT((
-        boost::is_same<
-        typename boost::detail::iterator_traits<Iterator>::value_type,
-        value_type
-        >::value));
+    typedef typename boost::detail::iterator_traits<Iterator>::value_type test_vt;
+    typedef typename assert_same<test_vt, value_type>::type a1;
 };

 template <class Iterator,
@ -140,23 +147,20 @@ template <class Iterator,
    class value_type, class difference_type, class pointer, class reference, class category>
 struct maybe_pointer_test
    : portable_tests<Iterator,value_type,difference_type,pointer,reference,category>
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
      , non_portable_tests<Iterator,value_type,difference_type,pointer,reference,category>
-#endif
 {
 };

 input_iterator_test<std::istream_iterator<int>, int, std::ptrdiff_t, int*, int&, std::input_iterator_tag>
        istream_iterator_test;

-// 
 #if defined(__BORLANDC__) && !defined(__SGI_STL_PORT)
 typedef ::std::char_traits<char>::off_type distance;
 non_pointer_test<std::ostream_iterator<int>,int,
    distance,int*,int&,std::output_iterator_tag> ostream_iterator_test;
 #elif defined(BOOST_MSVC_STD_ITERATOR)
 non_pointer_test<std::ostream_iterator<int>,
-    int, void, void, void, std::output_iterator_tag>
+    int, void, int*, int&, std::output_iterator_tag>
        ostream_iterator_test;
 #else
 non_pointer_test<std::ostream_iterator<int>,
@ -170,6 +174,7 @@ non_pointer_test<std::ostream_iterator<int>,
 #else
  typedef std::ptrdiff_t std_list_diff_type;
 #endif
+
 non_pointer_test<std::list<int>::iterator, int, std_list_diff_type, int*, int&, std::bidirectional_iterator_tag>
        list_iterator_test;

@ -184,16 +189,16 @@ non_pointer_test<my_iterator1, char, long, const char*, const char&, std::forwar
                    
 non_pointer_test<my_iterator2, char, long, const char*, const char&, std::forward_iterator_tag>
       my_iterator2_test;
-                    
+
 non_pointer_test<my_iterator3, char, int, const char*, const char&, std::forward_iterator_tag>
       my_iterator3_test;
-                    
+
 int main()
 {
    char chars[100];
    int ints[100];
-    
-    for (std::ptrdiff_t length = 3; length < 100; length += length / 3)
+
+    for (int length = 3; length < 100; length += length / 3)
    {
        std::list<int> l(length);
        assert(boost::detail::distance(l.begin(), l.end()) == length);
--- a/noncopyable_test.cpp
+++ b/noncopyable_test.cpp
@ -12,7 +12,7 @@
 //   9 Jun 99  Add unnamed namespace
 //   2 Jun 99  Initial Version

-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <iostream>

 //  This program demonstrates compiler errors resulting from trying to copy
--- a/numeric_traits_test.cpp
+++ b/numeric_traits_test.cpp
@ -214,7 +214,7 @@ struct signed_tag {};
 // Tests for unsigned numbers. The extra default Number parameter works around
 // an MSVC bug.
 template <class Number>
-void test_aux(unsigned_tag, Number* = 0)
+void test_aux(unsigned_tag, Number*)
 {
    typedef typename boost::detail::numeric_traits<Number>::difference_type difference_type;
    BOOST_STATIC_ASSERT(!boost::detail::is_signed<Number>::value);
@ -256,7 +256,7 @@ struct in_range_tag {};
 // This test morsel gets executed for numbers whose difference will always be
 // representable in intmax_t
 template <class Number>
-void signed_test(in_range_tag, Number* = 0)
+void signed_test(in_range_tag, Number*)
 {
    BOOST_STATIC_ASSERT(boost::detail::is_signed<Number>::value);
    typedef typename boost::detail::numeric_traits<Number>::difference_type difference_type;
@ -277,7 +277,7 @@ void signed_test(in_range_tag, Number* = 0)
 // This test morsel gets executed for numbers whose difference may exceed the
 // capacity of intmax_t.
 template <class Number>
-void signed_test(out_of_range_tag, Number* = 0)
+void signed_test(out_of_range_tag, Number*)
 {
    BOOST_STATIC_ASSERT(boost::detail::is_signed<Number>::value);
    typedef typename boost::detail::numeric_traits<Number>::difference_type difference_type;
@ -301,7 +301,7 @@ void signed_test(out_of_range_tag, Number* = 0)
 }

 template <class Number>
-void test_aux(signed_tag, Number* = 0)
+void test_aux(signed_tag, Number*)
 {
    typedef typename boost::detail::numeric_traits<Number>::difference_type difference_type;
    BOOST_STATIC_ASSERT(boost::detail::is_signed<Number>::value);
@ -328,7 +328,7 @@ void test_aux(signed_tag, Number* = 0)
                          out_of_range_tag
                        >::type
        range_tag;
-    signed_test<Number>(range_tag());
+    signed_test<Number>(range_tag(), 0);
 }


@ -347,7 +347,7 @@ void test(Number* = 0)

    // factoring out difference_type for the assert below confused Borland :(
    typedef boost::detail::is_signed<
-#ifndef BOOST_MSVC
+#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
        typename
 #endif
        boost::detail::numeric_traits<Number>::difference_type
@ -358,7 +358,7 @@ void test(Number* = 0)
        boost::detail::is_signed<Number>::value
        >::template then<signed_tag, unsigned_tag>::type signedness;
    
-    test_aux<Number>(signedness());
+    test_aux<Number>(signedness(), 0);
    std::cout << "passed" << std::endl;
 }

--- a/operators.htm
+++ b/operators.htm
--- a/operators_test.cpp
+++ b/operators_test.cpp
@ -1,11 +1,9 @@
 //  Demonstrate and test boost/operators.hpp  -------------------------------//

-//  (C) Copyright Beman Dawes 1999. 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.
+//  Copyright Beman Dawes 1999.
+//  See accompanying license for terms and conditions of use.

-//  See http://www.boost.org for most recent version including documentation.
+//  See http://www.boost.org/libs/utility for documentation.

 //  Revision History
 //  01 Oct 01 Added tests for "left" operators
@ -319,11 +317,20 @@ namespace
        test_multipliable_aux( x1, y1, x2, y2 );
        test_multipliable_aux( y1, x1, y2, x2 );
    }
-    
+
+  template <class A, class B>
+  void test_value_equality(A a, B b)
+  {
+      BOOST_TEST(a.value() == b);
+  }
+  
+#define TEST_OP_R(op) test_value_equality(x1 op y1, x2 op y2)
+#define TEST_OP_L(op) test_value_equality(y1 op x1, y2 op x2)
+  
    template <class X1, class Y1, class X2, class Y2>
    void test_addable_aux(X1 x1, Y1 y1, X2 x2, Y2 y2)
    {
-        BOOST_TEST( (x1 + y1).value() == (x2 + y2) );
+        TEST_OP_R(+);
    }
    
    template <class X1, class Y1, class X2, class Y2>
@ -333,19 +340,19 @@ namespace
        test_addable_aux( x1, y1, x2, y2 );
        test_addable_aux( y1, x1, y2, x2 );
    }
-    
+
    template <class X1, class Y1, class X2, class Y2>
    void test_subtractable(X1 x1, Y1 y1, X2 x2, Y2 y2)
    {
        sanity_check( x1, y1, x2, y2 );
-        BOOST_TEST( (x1 - y1).value() == (x2 - y2) );
+        TEST_OP_R(-);
    }

    template <class X1, class Y1, class X2, class Y2>
    void test_subtractable_left(X1 x1, Y1 y1, X2 x2, Y2 y2)
    {
        sanity_check( x1, y1, x2, y2 );
-        BOOST_TEST( (y1 - x1).value() == (y2 - x2) );
+        TEST_OP_L(-);
    }

    template <class X1, class Y1, class X2, class Y2>
@ -353,7 +360,7 @@ namespace
    {
        sanity_check( x1, y1, x2, y2 );
        if ( y2 != 0 )
-            BOOST_TEST( (x1 / y1).value() == (x2 / y2) );
+            TEST_OP_R(/);
    }
    
    template <class X1, class Y1, class X2, class Y2>
@ -361,7 +368,7 @@ namespace
    {
        sanity_check( x1, y1, x2, y2 );
        if ( x2 != 0 )
-            BOOST_TEST( (y1 / x1).value() == (y2 / x2) );
+            TEST_OP_L(/);
    }

    template <class X1, class Y1, class X2, class Y2>
@ -369,7 +376,7 @@ namespace
    {
        sanity_check( x1, y1, x2, y2 );
        if ( y2 != 0 )
-            BOOST_TEST( (x1 % y1).value() == (x2 % y2) );
+            TEST_OP_R(%);
    }
    
    template <class X1, class Y1, class X2, class Y2>
@ -377,13 +384,13 @@ namespace
    {
        sanity_check( x1, y1, x2, y2 );
        if ( x2 != 0 )
-            BOOST_TEST( (y1 % x1).value() == (y2 % x2) );
+            TEST_OP_L(%);
    }

    template <class X1, class Y1, class X2, class Y2>
    void test_xorable_aux(X1 x1, Y1 y1, X2 x2, Y2 y2)
    {
-        BOOST_TEST( (x1 ^ y1).value() == (x2 ^ y2) );
+        TEST_OP_R(^);
    }
    
    template <class X1, class Y1, class X2, class Y2>
@ -397,7 +404,7 @@ namespace
    template <class X1, class Y1, class X2, class Y2>
    void test_andable_aux(X1 x1, Y1 y1, X2 x2, Y2 y2)
    {
-        BOOST_TEST( (x1 & y1).value() == (x2 & y2) );
+        TEST_OP_R(&);
    }
    
    template <class X1, class Y1, class X2, class Y2>
@ -411,7 +418,7 @@ namespace
    template <class X1, class Y1, class X2, class Y2>
    void test_orable_aux(X1 x1, Y1 y1, X2 x2, Y2 y2)
    {
-        BOOST_TEST( (x1 | y1).value() == (x2 | y2) );
+        TEST_OP_R(|);
    }
    
    template <class X1, class Y1, class X2, class Y2>
@ -426,14 +433,14 @@ namespace
    void test_left_shiftable(X1 x1, Y1 y1, X2 x2, Y2 y2)
    {
        sanity_check( x1, y1, x2, y2 );
-        BOOST_TEST( (x1 << y1).value() == (x2 << y2) );
+        TEST_OP_R(<<);
    }
    
    template <class X1, class Y1, class X2, class Y2>
    void test_right_shiftable(X1 x1, Y1 y1, X2 x2, Y2 y2)
    {
        sanity_check( x1, y1, x2, y2 );
-        BOOST_TEST( (x1 >> y1).value() == (x2 >> y2) );
+        TEST_OP_R(>>);
    }
    
    template <class X1, class X2>
@ -555,7 +562,6 @@ template Wrapped6<unsigned int, unsigned char>;

 #define PRIVATE_EXPR_TEST(e, t)  BOOST_TEST( ((e), (t)) )

-
 int
 test_main( int , char * [] )
 {
@ -569,7 +575,7 @@ test_main( int , char * [] )
    
    cout << "Created point, and operated on it." << endl;
    
-    for (int n = 0; n < 10000; ++n)
+    for (int n = 0; n < 1000; ++n)  // was 10,000 but took too long (Beman)
    {
        boost::minstd_rand r;
        tester<long, int>()(r);
@ -631,7 +637,7 @@ test_main( int , char * [] )

    PRIVATE_EXPR_TEST( (i = i1 << i2), (i.value() == 4) );
    PRIVATE_EXPR_TEST( (i = i2 >> i1), (i.value() == 1) );
-    
+
    cout << "Performed tests on MyInt objects.\n";

    MyLong j1(1);
--- a/permutation_iterator.htm
+++ b/permutation_iterator.htm
@ -1,177 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<html>
-<head>
-<title>Permutation Iterator Adaptor Documentation</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-        
-<h1>Permutation Iterator Adaptor</h1>
-<p>Defined in header <a href="../../boost/permutation_iterator.hpp">boost/permutation_iterator.hpp</a></p>
-<p>The permutation iterator adaptor provides an iterator to a permutation of a given range.
-(<a href="http://www.cut-the-knot.com/do_you_know/permutation.html">see definition of permutation</a>).
-The adaptor takes two arguments
-<ul>
-<li>an iterator to the range V on which the <a href="http://www.cut-the-knot.com/do_you_know/permutation.html">permutation</a> will be applied</li>
-<li>the reindexing scheme that defines how the elements of V will be permuted.</li>
-</ul>
-
-<p>Note that the permutation iterator is not limited to strict permutations of the given range V. 
-The distance between begin and end of the reindexing iterators is allowed to be smaller compared to the 
-size of the range V, in which case the permutation iterator only provides a permutation of a subrange of V. 
-The indexes neither need to be unique. In this same context, it must be noted that the past the end permutation iterator is 
-completely defined by means of the past-the-end iterator to the indices</p> 
-
-<h2>Synopsis</h2>
-
-<blockquote>
-<pre>
-namespace boost {
-  template &lt;class IndexIterator&gt;
-  class permutation_iterator_policies;
-
-  template &lt;class ElementIterator, class IndexIterator&gt;
-  class permutation_iterator_generator;
-
-  template &lt;class ElementIterator, class IndexIterator&gt;
-  typename permutation_iterator_generator&lt;ElementIterator, IndexIterator&gt;::type
-  make_permutation_iterator(ElementIterator&amp; base, IndexIterator&amp; indexing);
-}
-</pre>
-</blockquote>
-
-
-<h2>The Permutation Iterator Generator Class Template</h2>
-
-<p>The <code>permutation_iterator_generator</code> is a helper class whose purpose
-is to construct a permutation iterator <strong>type</strong>. This class has
-two template arguments, the first being the iterator type over the range V, the
-second being the type of the iterator over the indices.
-
-<blockquote>
-<pre>
-template &lt;class ElementIterator, class IndexIterator&gt;
-class permutation_iterator_generator
-{
-public:
-  typedef <a href="iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt...&gt; type; // the resulting permutation iterator type 
-}
-</pre>
-</blockquote>
-
-
-<h3>Template Parameters</h3>
-
-<table border>
-<tr>
-<th>Parameter</th>
-<th>Description</th>
-</tr>
-
-<tr>
-<td><tt>ElementIterator</tt></td>
-<td>The iterator over the elements to be permuted. This type must be a model
-of <a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">RandomAccessIterator</a></td>
-</td>
-
-<tr>
-<td><tt>IndexIterator</tt></td>
-<td>The iterator over the new indexing scheme. This type must at least be a model
-of <a href="http://www.sgi.com/tech/stl/ForwardIterator.html">ForwardIterator</a>.
-The <code>IndexIterator::value_type</code> must be convertible to the 
-<code>ElementIterator::difference_type</code>.</td>
-</table>
-
-<h3>Concept Model</h3>
-The permutation iterator is always a model of the same concept as the IndexIterator.
-
-<h3>Members</h3>
-The permutation iterator implements the member functions
-and operators required for the 
-<a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access Iterator</a>
-concept. However, the permutation iterator can only meet the complexity guarantees 
-of the same concept as the IndexIterator. Thus for instance, although the permutation
-iterator provides <code>operator+=(distance)</code>, this operation will take linear time
-in case the IndexIterator is a model of ForwardIterator instead of amortized constant time.
-
-<br>
-
-<h2><a name="make_generator_iterator">The Permutation Iterator Object Generator</a></h2>
-
-The <code>make_permutation_iterator()</code> function provides a
-convenient way to create permutation iterator objects. The function
-saves the user the trouble of explicitly writing out the iterator
-types.
-
-<blockquote>
-<pre>
-template &lt;class ElementIterator, class IndexIterator &gt;
-typename permutation_iterator_generator&lt;ElementIterator, IndexIterator&gt;::type
-make_permutation_iterator(ElementIterator&amp; base, IndexIterator&amp; indices);
-</pre>
-</blockquote>
-
-<h2>Example</h2>
-<blockquote>
-<pre>
-  using namespace boost;
-  int i = 0;
-
-  typedef std::vector< int > element_range_type;
-  typedef std::list< int > index_type;
-
-  static const int element_range_size = 10;
-  static const int index_size = 4;
-
-  element_range_type elements( element_range_size );
-  for(element_range_type::iterator el_it = elements.begin() ; el_it != elements.end() ; ++el_it) *el_it = std::distance(elements.begin(), el_it);
-
-  index_type indices( index_size );
-  for(index_type::iterator i_it = indices.begin() ; i_it != indices.end() ; ++i_it ) *i_it = element_range_size - index_size + std::distance(indices.begin(), i_it);
-  std::reverse( indices.begin(), indices.end() );
-
-  typedef permutation_iterator_generator< element_range_type::iterator, index_type::iterator >::type permutation_type;
-  permutation_type begin = make_permutation_iterator( elements.begin(), indices.begin() );
-  permutation_type it = begin;
-  permutation_type end = make_permutation_iterator( elements.begin(), indices.end() );
-
-  std::cout << "The original range is : ";
-  std::copy( elements.begin(), elements.end(), std::ostream_iterator< int >( std::cout, " " ) );
-  std::cout << "\n";
-
-  std::cout << "The reindexing scheme is : ";
-  std::copy( indices.begin(), indices.end(), std::ostream_iterator< int >( std::cout, " " ) );
-  std::cout << "\n";
-
-  std::cout << "The permutated range is : ";
-  std::copy( begin, end, std::ostream_iterator< int >( std::cout, " " ) );
-  std::cout << "\n";
-
-  std::cout << "Elements at even indices in the permutation : ";
-  it = begin;
-  for(i = 0; i < index_size / 2 ; ++i, it+=2 ) std::cout << *it << " ";
-  std::cout << "\n";
-
-  std::cout << "Permutation backwards : ";
-  it = begin + (index_size);
-  assert( it != begin );
-  for( ; it-- != begin ; ) std::cout << *it << " ";
-  std::cout << "\n";
-
-  std::cout << "Iterate backward with stride 2 : ";
-  it = begin + (index_size - 1);
-  for(i = 0 ; i < index_size / 2 ; ++i, it-=2 ) std::cout << *it << " ";
-  std::cout << "\n";
-</pre>
-</blockquote>
-
-<br><br><br><hr>
-Thanks: The permutation iterator is only a small addition to the superb iterator adaptors
-library of David Abrahams and Jeremy Siek.
-<br><br>
-
-Copyright 2001 Toon Knapen.
-
-</body>
-</html>
--- a/projection_iterator.htm
+++ b/projection_iterator.htm
@ -1,391 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Projection Iterator Adaptor Documentation</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-<img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)"
-align="center" width="277" height="86">
-
-<h1>Projection Iterator Adaptor</h1>
-
-Defined in header
-<a href="../../boost/iterator_adaptors.hpp">boost/iterator_adaptors.hpp</a>
-
-<p>
-The projection iterator adaptor is similar to the <a
-href="./transform_iterator.htm">transform iterator adaptor</a> in that
-its <tt>operator*()</tt> applies some function to the result of
-dereferencing the base iterator and then returns the result. The
-difference is that the function must return a reference to some
-existing object (for example, a data member within the
-<tt>value_type</tt> of the base iterator). The following
-<b>pseudo-code</b> gives the basic idea. The data member <tt>p</tt> is
-the function object.
-
-<pre>
-  reference projection_iterator::operator*() const {
-    return this->p(*this->base_iterator);
-  }
-</pre>
-
-<h2>Synopsis</h2>
-
-<pre>
-namespace boost {
-  template &lt;class <a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>, class BaseIterator&gt;
-  struct projection_iterator_generator;
-  
-  template &lt;class <a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>, 
-            class BaseIterator, class ConstBaseIterator&gt;
-  struct projection_iterator_pair_generator;
-
-  template &lt;class <a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>, class BaseIterator&gt;
-  typename projection_iterator_generator&lt;AdaptableUnaryFunction, BaseIterator&gt;::type
-  make_projection_iterator(BaseIterator base,
-			   const AdaptableUnaryFunction& p = AdaptableUnaryFunction())
-
-  template &lt;class <a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>, class ConstBaseIterator&gt;
-  typename projection_iterator_generator&lt;AdaptableUnaryFunction, ConstBaseIterator&gt;::type
-  make_const_projection_iterator(ConstBaseIterator base,
-                                 const AdaptableUnaryFunction& p = AdaptableUnaryFunction())  
-}
-</pre>
-
-<hr>
-
-<h2><a name="projection_iterator_generator">The Projection Iterator Type
-Generator</a></h2>
-
-The class <tt>projection_iterator_generator</tt> is a helper class
-whose purpose is to construct an projection iterator type.  The main
-template parameter for this class is the <a
-href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html"><tt>AdaptableUnaryFunction</tt></a>
-function object type and the <tt>BaseIterator</tt> type that is being
-wrapped.
-
-<pre>
-template &lt;class <a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>, class BaseIterator&gt;
-class projection_iterator_generator
-{
-public:
-  typedef <tt><a href="./iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt...&gt;</tt> type; // the resulting projection iterator type 
-};
-</pre>
-
-<h3>Example</h3>
-
-In the following example we have a list of personnel records. Each
-record has an employee's name and ID number. We want to be able to
-traverse through the list accessing either the name or the ID numbers
-of the employees using the projection iterator so we create the
-function object classes <tt>select_name</tt> and
-<tt>select_ID</tt>. We then use the
-<tt>projection_iterator_generator</tt> class to create a projection
-iterator and use it to print out the names of the employees.
-
-<pre>
-#include &lt;boost/config.hpp&gt;
-#include &lt;list&gt;
-#include &lt;iostream&gt;
-#include &lt;iterator&gt;
-#include &lt;algorithm&gt;
-#include &lt;string&gt;
-#include &lt;boost/iterator_adaptors.hpp&gt;
-
-struct personnel_record {
-  personnel_record(std::string n, int id) : m_name(n), m_ID(id) { }
-  std::string m_name;
-  int m_ID;
-};
-
-struct select_name {
-  typedef personnel_record argument_type;
-  typedef std::string result_type;
-  const std::string&amp; operator()(const personnel_record&amp; r) const {
-    return r.m_name;
-  }
-  std::string&amp; operator()(personnel_record&amp; r) const {
-    return r.m_name;
-  }
-};
-
-struct select_ID {
-  typedef personnel_record argument_type;
-  typedef int result_type;
-  const int&amp; operator()(const personnel_record&amp; r) const {
-    return r.m_ID;
-  }
-  int&amp; operator()(personnel_record&amp; r) const {
-    return r.m_ID;
-  }
-};
-
-int main(int, char*[])
-{
-  std::list&lt;personnel_record&gt; personnel_list;
-
-  personnel_list.push_back(personnel_record("Barney", 13423));
-  personnel_list.push_back(personnel_record("Fred", 12343));
-  personnel_list.push_back(personnel_record("Wilma", 62454));
-  personnel_list.push_back(personnel_record("Betty", 20490));
-
-  // Example of using projection_iterator_generator
-  // to print out the names in the personnel list.
-
-  boost::projection_iterator_generator&lt;select_name,
-    std::list&lt;personnel_record&gt;::iterator&gt;::type
-    personnel_first(personnel_list.begin()),
-    personnel_last(personnel_list.end());
-
-  std::copy(personnel_first, personnel_last,
-            std::ostream_iterator&lt;std::string&gt;(std::cout, "\n"));
-  std::cout &lt;&lt; std::endl;
-
-  // to be continued...
-</pre>
-The output for this part is:
-<pre>
-Barney
-Fred
-Wilma
-Betty
-</pre>
-
-<h3>Template Parameters</h3>
-
-<Table border>
-<TR>
-<TH>Parameter</TH><TH>Description</TH>
-</TR>
-
-<TR>
-<TD><a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html"><tt>AdaptableUnaryFunction</tt></a></TD>
-<TD>The type of the function object. The <tt>argument_type</tt> of the
-function must match the value type of the base iterator. The function
-should return a reference to the function's <tt>result_type</tt>.
-The <tt>result_type</tt> will be the resulting iterator's <tt>value_type</tt>.
-</TD>
-</TD>
-
-<TR>
-<TD><tt>BaseIterator</tt></TD>
-<TD>The iterator type being wrapped.</TD>
-</TD>
-</TR>
-
-</Table>
-
-<h3>Model of</h3>
-
-If the base iterator is a model of <a
-href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-Access Iterator</a> then so is the resulting projection iterator.  If
-the base iterator supports less functionality than this the resulting
-projection iterator will also support less functionality.
-
-<h3>Members</h3>
-
-The projection iterator type implements the member functions and
-operators required of the <a
-href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-Access Iterator</a> concept.
-In addition it has the following constructor:
-
-<pre>
-projection_iterator_generator::type(const BaseIterator&amp; it,
-                                    const AdaptableUnaryFunction&amp; p = AdaptableUnaryFunction())
-</pre>
-
-<p>
-<hr>
-<p>
-
-<h2><a name="projection_iterator_pair_generator">The Projection Iterator Pair
-Generator</a></h2>
-
-Sometimes a mutable/const pair of iterator types is needed, such as
-when implementing a container type. The
-<tt>projection_iterator_pair_generator</tt> class makes it more
-convenient to create this pair of iterator types.
-
-<pre>
-template &lt;class <a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>, class BaseIterator, class ConstBaseIterator&gt;
-class projection_iterator_pair_generator
-{
-public:
-  typedef <tt><a href="./iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt...&gt;</tt> iterator;       // the mutable projection iterator type 
-  typedef <tt><a href="./iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt...&gt;</tt> const_iterator; // the immutable projection iterator type 
-};
-</pre>
-
-<h3>Example</h3>
-
-In this part of the example we use the
-<tt>projection_iterator_pair_generator</tt> to create a mutable/const
-pair of projection iterators that access the ID numbers of the
-personnel. We use the mutable iterator to re-index the ID numbers from
-zero. We then use the constant iterator to print the ID numbers out.
-
-<pre>
-  // continuing from the last example...
-
-  typedef boost::projection_iterator_pair_generator&lt;select_ID,
-    std::list&lt;personnel_record&gt;::iterator,
-    std::list&lt;personnel_record&gt;::const_iterator&gt; PairGen;
-
-  PairGen::iterator ID_first(personnel_list.begin()),
-    ID_last(personnel_list.end());
-
-  int new_id = 0;
-  while (ID_first != ID_last) {
-    *ID_first = new_id++;
-    ++ID_first;
-  }
-
-  PairGen::const_iterator const_ID_first(personnel_list.begin()),
-    const_ID_last(personnel_list.end());
-
-  std::copy(const_ID_first, const_ID_last,
-            std::ostream_iterator&lt;int&gt;(std::cout, " "));
-  std::cout &lt;&lt; std::endl;
-  std::cout &lt;&lt; std::endl;
-  
-  // to be continued...
-</pre&gt;
-The output is:
-<pre>
-0 1 2 3 
-</pre>
-
-<h3>Template Parameters</h3>
-
-<Table border>
-<TR>
-<TH>Parameter</TH><TH>Description</TH>
-</TR>
-
-<TR>
-<TD><a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html"><tt>AdaptableUnaryFunction</tt></a></TD>
-<TD>The type of the function object. The <tt>argument_type</tt> of the
-function must match the value type of the base iterator. The function
-should return a true reference to the function's <tt>result_type</tt>.
-The <tt>result_type</tt> will be the resulting iterator's <tt>value_type</tt>.
-</TD>
-</TD>
-
-<TR>
-<TD><tt>BaseIterator</tt></TD>
-<TD>The mutable iterator type being wrapped.</TD>
-</TD>
-</TR>
-
-<TR>
-<TD><tt>ConstBaseIterator</tt></TD>
-<TD>The constant iterator type being wrapped.</TD>
-</TD>
-</TR>
-
-</Table>
-
-<h3>Model of</h3>
-
-If the base iterator types model the <a
-href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-Access Iterator</a> then so do the resulting projection iterator
-types.  If the base iterators support less functionality the
-resulting projection iterator types will also support less
-functionality.  The resulting <tt>iterator</tt> type is mutable, and
-the resulting <tt>const_iterator</tt> type is constant.
-
-<h3>Members</h3>
-
-The resulting <tt>iterator</tt> and <tt>const_iterator</tt> types
-implements the member functions and operators required of the <a
-href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-Access Iterator</a> concept.  In addition they support the following
-constructors:
-
-<pre>
-projection_iterator_pair_generator::iterator(const BaseIterator&amp; it,
-                                             const AdaptableUnaryFunction&amp; p = AdaptableUnaryFunction())</pre>
-
-<pre>
-projection_iterator_pair_generator::const_iterator(const BaseIterator&amp; it,
-                                                   const AdaptableUnaryFunction&amp; p = AdaptableUnaryFunction())
-</pre>
-
-<p>
-<hr>
-<p>
-
-<h2><a name="make_projection_iterator">The Projection Iterator Object Generators</a></h2>
-
-The <tt>make_projection_iterator()</tt> and
-<tt>make_const_projection_iterator()</tt> functions provide a more
-convenient way to create projection iterator objects. The functions
-save the user the trouble of explicitly writing out the iterator
-types.
-
-<pre>
-template &lt;class <a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>, class BaseIterator&gt;
-typename projection_iterator_generator&lt;AdaptableUnaryFunction, BaseIterator&gt;::type
-make_projection_iterator(BaseIterator base,
-			 const AdaptableUnaryFunction& p = AdaptableUnaryFunction())  
-
-template &lt;class <a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>, class ConstBaseIterator&gt;
-typename projection_iterator_generator&lt;AdaptableUnaryFunction, ConstBaseIterator&gt;::type
-make_const_projection_iterator(ConstBaseIterator base,
-			       const AdaptableUnaryFunction& p = AdaptableUnaryFunction())  
-</pre>
-
-
-<h3>Example</h3>
-
-In this part of the example, we again print out the names of the
-personnel, but this time we use the
-<tt>make_const_projection_iterator()</tt> function to save some typing.
-
-<pre>
-  // continuing from the last example...
-
-  std::copy
-    (boost::make_const_projection_iterator&lt;select_name&gt;(personnel_list.begin()),
-     boost::make_const_projection_iterator&lt;select_name&gt;(personnel_list.end()),
-     std::ostream_iterator<std::string>(std::cout, "\n"));
-
-  return 0;
-}
-</pre>
-The output is:
-<pre>
-Barney
-Fred
-Wilma
-Betty
-</pre>
-
-<hr>
-<p>Revised <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->19 Aug 2001<!--webbot bot="Timestamp" endspan i-checksum="14767" --></p>
-<p><EFBFBD> Copyright Jeremy Siek 2000. Permission to copy, use,
-modify, sell and distribute this document is granted provided this copyright
-notice appears in all copies. This document is provided &quot;as is&quot;
-without express or implied warranty, and with no claim as to its suitability for
-any purpose.</p>
-
-</body>
-
-</html>
-<!--  LocalWords:  html charset alt gif hpp BaseIterator const namespace struct
- -->
-<!--  LocalWords:  ConstPointer ConstReference typename iostream int abcdefg
- -->
-<!--  LocalWords:  sizeof  PairGen pre Siek htm AdaptableUnaryFunction
- -->
-<!--  LocalWords:  ConstBaseIterator
- -->
--- a/projection_iterator_example.cpp
+++ b/projection_iterator_example.cpp
@ -9,7 +9,7 @@
 #include <iterator>
 #include <algorithm>
 #include <string>
-#include <boost/iterator_adaptors.hpp>
+#include <boost/iterator/transform_iterator.hpp>

 struct personnel_record {
  personnel_record(std::string n, int id) : m_name(n), m_ID(id) { }
@ -19,7 +19,7 @@ struct personnel_record {

 struct select_name {
  typedef personnel_record argument_type;
-  typedef std::string result_type;
+  typedef std::string const& result_type;
  const std::string& operator()(const personnel_record& r) const {
    return r.m_name;
  }
@ -30,7 +30,7 @@ struct select_name {

 struct select_ID {
  typedef personnel_record argument_type;
-  typedef int result_type;
+  typedef int& result_type;
  const int& operator()(const personnel_record& r) const {
    return r.m_ID;
  }
@ -48,11 +48,16 @@ int main(int, char*[])
  personnel_list.push_back(personnel_record("Wilma", 62454));
  personnel_list.push_back(personnel_record("Betty", 20490));

-  // Example of using projection_iterator_generator
-  // to print out the names in the personnel list.
+  // Example of using transform_iterator to print out the names in the
+  // personnel list using a projection.

-  boost::projection_iterator_generator<select_name,
-    std::list<personnel_record>::iterator>::type
+  boost::transform_iterator<
+      select_name
+    , std::list<personnel_record>::iterator
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+    , std::string
+#endif 
+  >
    personnel_first(personnel_list.begin()),
    personnel_last(personnel_list.end());

@ -60,14 +65,12 @@ int main(int, char*[])
            std::ostream_iterator<std::string>(std::cout, "\n"));
  std::cout << std::endl;
  
-  // Example of using projection_iterator_pair_generator
-  // to assign new ID numbers to the personnel.
+  // Example of using transform_iterator with const_iterators to
+  // assign new ID numbers to the personnel.
  
-  typedef boost::projection_iterator_pair_generator<select_ID,
-    std::list<personnel_record>::iterator,
-    std::list<personnel_record>::const_iterator> PairGen;
-
-  PairGen::iterator ID_first(personnel_list.begin()),
+  boost::transform_iterator<
+      select_ID, std::list<personnel_record>::iterator
+ > ID_first(personnel_list.begin()),
    ID_last(personnel_list.end());

  int new_id = 0;
@ -76,21 +79,25 @@ int main(int, char*[])
    ++ID_first;
  }

-  PairGen::const_iterator const_ID_first(personnel_list.begin()),
+    boost::transform_iterator<
+      select_ID, std::list<personnel_record>::const_iterator, int const&
+    >
+    const_ID_first(personnel_list.begin()),
    const_ID_last(personnel_list.end());

  std::copy(const_ID_first, const_ID_last,
            std::ostream_iterator<int>(std::cout, " "));
  std::cout << std::endl;
  std::cout << std::endl;
-  
+
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
  // Example of using make_const_projection_iterator()
  // to print out the names in the personnel list again.
+  std::copy(
+      boost::make_transform_iterator<select_name>(personnel_list.begin())
+    , boost::make_transform_iterator<select_name>(personnel_list.end())
+    , std::ostream_iterator<std::string>(std::cout, "\n"));
+#endif
  
-  std::copy
-    (boost::make_const_projection_iterator<select_name>(personnel_list.begin()),
-     boost::make_const_projection_iterator<select_name>(personnel_list.end()),
-     std::ostream_iterator<std::string>(std::cout, "\n"));
-
  return 0;
 }
--- a/reverse_iterator.htm
+++ b/reverse_iterator.htm
@ -1,331 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<html>
-<head>
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-    <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-    <meta name="ProgId" content="FrontPage.Editor.Document">
-
-    <title>Reverse Iterator Adaptor Documentation</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-    <img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" align=
-    "center" width="277" height="86"> 
-
-    <h1>Reverse Iterator Adaptor</h1>
-    Defined in header <a href=
-    "../../boost/iterator_adaptors.hpp">boost/iterator_adaptors.hpp</a> 
-
-    <p>The reverse iterator adaptor flips the direction of a base iterator's
-    motion. Invoking <tt>operator++()</tt> moves the base iterator backward and
-    invoking <tt>operator--()</tt> moves the base iterator forward. The Boost
-    reverse iterator adaptor is better to use than the
-    <tt>std::reverse_iterator</tt> class in situations where pairs of
-    mutable/constant iterators are needed (e.g., in containers) because
-    comparisons and conversions between the mutable and const versions are
-    implemented correctly.
-
-    <h2>Synopsis</h2>
-<pre>
-namespace boost {
-  template &lt;class <a href=
-"http://www.sgi.com/tech/stl/BidirectionalIterator.html">BidirectionalIterator</a>,
-            class Value, class Reference, class Pointer, class Category, class Distance&gt;
-  struct reverse_iterator_generator;
-  
-  template &lt;class <a href=
-"http://www.sgi.com/tech/stl/BidirectionalIterator.html">BidirectionalIterator</a>&gt;
-  typename reverse_iterator_generator&lt;BidirectionalIterator&gt;::type
-  make_reverse_iterator(BidirectionalIterator base)  
-}
-</pre>
-    <hr>
-
-    <h2><a name="reverse_iterator_generator">The Reverse Iterator Type
-    Generator</a></h2>
-    The <tt>reverse_iterator_generator</tt> template is a <a href=
-    "../../more/generic_programming.html#type_generator">generator</a> of
-    reverse iterator types. The main template parameter for this class is the
-    base <tt>BidirectionalIterator</tt> type that is being adapted. In most
-    cases the associated types of the base iterator can be deduced using
-    <tt>std::iterator_traits</tt>, but in some situations the user may want to
-    override these types, so there are also template parameters for the base
-    iterator's associated types. 
-
-    <blockquote>
-<pre>
-template &lt;class <a href=
-"http://www.sgi.com/tech/stl/BidirectionalIterator.html">BidirectionalIterator</a>,
-          class Value, class Reference, class Pointer, class Category, class Distance&gt;
-class reverse_iterator_generator
-{
-public:
-  typedef <tt><a href=
-"./iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt;...&gt;</tt> type; // the resulting reverse iterator type 
-};
-</pre>
-    </blockquote>
-
-    <h3>Example</h3>
-    In this example we sort a sequence of letters and then output the sequence
-    in descending order using reverse iterators. 
-
-    <blockquote>
-<pre>
-#include &lt;boost/config.hpp&gt;
-#include &lt;iostream&gt;
-#include &lt;algorithm&gt;
-#include &lt;boost/iterator_adaptors.hpp&gt;
-
-int main(int, char*[])
-{
-  char letters[] = "hello world!";
-  const int N = sizeof(letters)/sizeof(char) - 1;
-  std::cout &lt;&lt; "original sequence of letters:\t"
-      &lt;&lt; letters &lt;&lt; std::endl;
-
-  std::sort(letters, letters + N);
-
-  // Use reverse_iterator_generator to print a sequence
-  // of letters in reverse order.
-  
-  boost::reverse_iterator_generator&lt;char*&gt;::type
-    reverse_letters_first(letters + N),
-    reverse_letters_last(letters);
-
-  std::cout &lt;&lt; "letters in descending order:\t";
-  std::copy(reverse_letters_first, reverse_letters_last,
-      std::ostream_iterator&lt;char&gt;(std::cout));
-  std::cout &lt;&lt; std::endl;
-
-  // to be continued...
-</pre>
-    </blockquote>
-    The output is: 
-
-    <blockquote>
-<pre>
-original sequence of letters: hello world!
-letters in descending order:  wroolllhed! 
-</pre>
-    </blockquote>
-
-    <h3>Template Parameters</h3>
-
-    <table border>
-      <tr>
-        <th>Parameter
-
-        <th>Description
-
-      <tr>
-        <td><tt><a href=
-        "http://www.sgi.com/tech/stl/BidirectionalIterator.html">BidirectionalIterator</a></tt>
-        
-
-        <td>The iterator type being wrapped.
-
-      <tr>
-        <td><tt>Value</tt> 
-
-        <td>The value-type of the base iterator and the resulting reverse
-        iterator.<br>
-         <b>Default:</b><tt>std::iterator_traits&lt;BidirectionalIterator&gt;::value_type</tt>
-        
-
-      <tr>
-        <td><tt>Reference</tt> 
-
-        <td>The <tt>reference</tt> type of the resulting iterator, and in
-        particular, the result type of <tt>operator*()</tt>.<br>
-         <b>Default:</b> If <tt>Value</tt> is supplied, <tt>Value&amp;</tt> is
-        used. Otherwise
-        <tt>std::iterator_traits&lt;BidirectionalIterator&gt;::reference</tt>
-        is used.
-
-      <tr>
-        <td><tt>Pointer</tt> 
-
-        <td>The <tt>pointer</tt> type of the resulting iterator, and in
-        particular, the result type of <tt>operator-&gt;()</tt>.<br>
-         <b>Default:</b> If <tt>Value</tt> was supplied, then <tt>Value*</tt>,
-        otherwise
-        <tt>std::iterator_traits&lt;BidirectionalIterator&gt;::pointer</tt>.
-
-      <tr>
-        <td><tt>Category</tt> 
-
-        <td>The <tt>iterator_category</tt> type for the resulting iterator.<br>
-         <b>Default:</b>
-        <tt>std::iterator_traits&lt;BidirectionalIterator&gt;::iterator_category</tt>
-        
-
-      <tr>
-        <td><tt>Distance</tt> 
-
-        <td>The <tt>difference_type</tt> for the resulting iterator.<br>
-         <b>Default:</b>
-        <tt>std::iterator_traits&lt;BidirectionalIterator&amp;gt::difference_type</tt>
-        
-    </table>
-
-    <h3>Concept Model</h3>
-    The indirect iterator will model whichever <a href=
-    "http://www.sgi.com/tech/stl/Iterators.html">standard iterator concept
-    category</a> is modeled by the base iterator. Thus, if the base iterator is
-    a model of <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access
-    Iterator</a> then so is the resulting indirect iterator. If the base
-    iterator models a more restrictive concept, the resulting indirect iterator
-    will model the same concept. The base iterator must be at least a <a href=
-    "http://www.sgi.com/tech/stl/BidirectionalIterator.html">Bidirectional
-    Iterator</a> 
-
-    <h3>Members</h3>
-    The reverse iterator type implements the member functions and operators
-    required of the <a href=
-    "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access
-    Iterator</a> concept. In addition it has the following constructor: 
-
-    <blockquote>
-<pre>
-reverse_iterator_generator::type(const BidirectionalIterator&amp; it)
-</pre>
-    </blockquote>
-
-
-    <br>
-     <br>
-     
-    <hr>
-
-    <p>
-
-    <h2><a name="make_reverse_iterator">The Reverse Iterator Object
-    Generator</a></h2>
-    The <tt>make_reverse_iterator()</tt> function provides a more convenient
-    way to create reverse iterator objects. The function saves the user the
-    trouble of explicitly writing out the iterator types. 
-
-    <blockquote>
-<pre>
-template &lt;class BidirectionalIterator&gt;
-typename reverse_iterator_generator&lt;BidirectionalIterator&gt;::type
-make_reverse_iterator(BidirectionalIterator base);
-</pre>
-    </blockquote>
-
-    <h3>Example</h3>
-    In this part of the example we use <tt>make_reverse_iterator()</tt> to
-    print the sequence of letters in reverse-reverse order, which is the
-    original order. 
-
-    <blockquote>
-<pre>
-  // continuing from the previous example...
-
-  std::cout &lt;&lt; "letters in ascending order:\t";
-  std::copy(boost::make_reverse_iterator(reverse_letters_last),
-      boost::make_reverse_iterator(reverse_letters_first),
-      std::ostream_iterator&lt;char&gt;(std::cout));
-  std::cout &lt;&lt; std::endl;
-
-  return 0;
-}
-</pre>
-    </blockquote>
-    The output is: 
-
-    <blockquote>
-<pre>
-letters in ascending order:  !dehllloorw
-</pre>
-    </blockquote>
-    <hr>
-
-    <h2><a name="interactions">Constant/Mutable Iterator Interactions</a></h2>
-
-    <p>One failing of the standard <tt><a
-    href="http://www.sgi.com/tech/stl/ReverseIterator.html">reverse_iterator</a></tt>
-    adaptor is that it doesn't properly support interactions between adapted
-    <tt>const</tt> and non-<tt>const</tt> iterators. For example:
-<blockquote>
-<pre>
-#include &lt;vector&gt;
-
-template &lt;class T&gt; void convert(T x) {}
-
-// Test interactions of a matched pair of random access iterators
-template &lt;class Iterator, class ConstIterator&gt;
-void test_interactions(Iterator i, ConstIterator ci)
-{
-  bool eq = i == ci;               // comparisons
-  bool ne = i != ci;            
-  bool lt = i &lt; ci;
-  bool le = i &lt;= ci;
-  bool gt = i &gt; ci;
-  bool ge = i &gt;= ci;
-  std::size_t distance = i - ci;   // difference
-  ci = i;                          // assignment
-  ConstIterator ci2(i);            // construction
-  convert&lt;ConstIterator&gt;(i);       // implicit conversion
-}
-
-void f()
-{
-  typedef std::vector&lt;int&gt; vec;
-  vec v;
-  const vec&amp; cv;
-
-  test_interactions(v.begin(), cv.begin());   // <font color="#007F00">OK</font>
-  test_interactions(v.rbegin(), cv.rbegin()); // <font color="#FF0000">ERRORS ON EVERY TEST!!</font>
-</pre>
-</blockquote>
-Reverse iterators created with <tt>boost::reverse_iterator_generator</tt> don't have this problem, though:
-<blockquote>
-<pre>
-  typedef boost::reverse_iterator_generator&lt;vec::iterator&gt;::type ri;
-  typedef boost::reverse_iterator_generator&lt;vec::const_iterator&gt;::type cri;
-  test_interactions(ri(v.begin()), cri(cv.begin()));   // <font color="#007F00">OK!!</font>
-</pre>
-</blockquote>
-Or, more simply,
-<blockquote>
-<pre>
-  test_interactions(
-    boost::make_reverse_iterator(v.begin()), 
-    boost::make_reverse_iterator(cv.begin()));   // <font color="#007F00">OK!!</font>
-}
-</pre>
-</blockquote>
-
-<p>If you are wondering why there is no
-<tt>reverse_iterator_pair_generator</tt> in the manner of <tt><a
-href="projection_iterator.htm#projection_iterator_pair_generator">projection_iterator_pair_generator</a></tt>,
-the answer is simple: we tried it, but found that in practice it took
-<i>more</i> typing to use <tt>reverse_iterator_pair_generator</tt> than to
-simply use <tt>reverse_iterator_generator</tt> twice!<br><br>
-
-<hr>
-
-    
-    <p>Revised 
-    <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->19 Aug 2001<!--webbot bot="Timestamp" endspan i-checksum="14767" -->
-
-
-    <p>&copy; Copyright Jeremy Siek 2000. Permission to copy, use, modify, sell
-    and distribute this document is granted provided this copyright notice
-    appears in all copies. This document is provided "as is" without express or
-    implied warranty, and with no claim as to its suitability for any purpose. 
-    <!--  LocalWords:  html charset alt gif hpp BidirectionalIterator const namespace struct
-         -->
-     
-    <!--  LocalWords:  ConstPointer ConstReference typename iostream int abcdefg
-         -->
-     <!--  LocalWords:  sizeof  PairGen pre Siek wroolllhed dehllloorw
-         -->
-</body>
-</html>
-
--- a/reverse_iterator_example.cpp
+++ b/reverse_iterator_example.cpp
@ -6,19 +6,15 @@
 #include <boost/config.hpp>
 #include <iostream>
 #include <algorithm>
-#include <boost/iterator_adaptors.hpp>
+#include <boost/iterator/reverse_iterator.hpp>
+#include <boost/detail/iterator.hpp>

+//boost::detail::iterator_traits
 int main(int, char*[])
 {
  char letters_[] = "hello world!";
  const int N = sizeof(letters_)/sizeof(char) - 1;
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-  // Assume there won't be proper iterator traits for pointers. This
-  // is just a wrapper for char* which has the right traits.
-  typedef boost::iterator_adaptor<char*, boost::default_iterator_policies, char> base_iterator;
-#else
  typedef char* base_iterator;
-#endif
  base_iterator letters(letters_);
  
  std::cout << "original sequence of letters:\t"
@ -29,7 +25,7 @@ int main(int, char*[])
  // Use reverse_iterator_generator to print a sequence
  // of letters in reverse order.
  
-  boost::reverse_iterator_generator<base_iterator>::type
+  boost::reverse_iterator<base_iterator>
    reverse_letters_first(letters + N),
    reverse_letters_last(letters);

--- a/shared_container_iterator.html
+++ b/shared_container_iterator.html
@ -0,0 +1,323 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
+<meta name="ProgId" content="FrontPage.Editor.Document">
+<title>Shared Container Iterator Documentation</title>
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+<img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)"
+align="center" width="277" height="86">
+
+<h1>Shared Container Iterator</h1>
+
+Defined in header
+<a href="../../boost/shared_container_iterator.hpp">boost/shared_container_iterator.hpp</a>
+
+<p>
+The purpose of the shared container iterator is to attach the lifetime
+of a container to the lifetime of its iterators. In other words, the
+container will not be deleted until after all its iterators are
+destroyed.  The shared container iterator is typically used to
+implement functions that return iterators over a range of objects that
+only need to exist for the lifetime of the iterators.  By returning a
+pair of shared iterators from a function, the callee can return a
+heap-allocated range of objects whose lifetime is automatically managed.
+<p>
+The shared container iterator augments an iterator over a shared
+container.  It maintains a reference count on the shared 
+container. If only shared container iterators hold references to
+the container, the container's lifetime will end when the last shared
+container iterator over it is destroyed.  In any case, the shared
+container is guaranteed to persist beyond the lifetime of all
+the iterators. In all other ways, the
+shared container iterator behaves the same as its base iterator.
+
+
+<h2>Synopsis</h2>
+
+<pre>
+namespace boost {
+  template &lt;typename <a href="http://www.sgi.com/tech/stl/Container.html">Container</a>&gt;
+  class shared_container_iterator;
+
+  template &lt;typename <a href="http://www.sgi.com/tech/stl/Container.html">Container</a>&gt;
+  shared_container_iterator&lt;Container&gt;
+  make_shared_container_iterator(typename Container::iterator base, 
+    boost::shared_ptr&lt;Container&gt; const&amp; container);
+
+  std::pair&lt;
+    typename shared_container_iterator&lt;Container&gt;,
+    typename shared_container_iterator&lt;Container&gt;
+  &gt;
+  make_shared_container_range(boost::shared_ptr&lt;Container&gt; const&amp; container);
+}
+</pre>
+
+<hr>
+
+<h2><a name="generator">The Shared Container Iterator Type</a></h2>
+
+<pre>
+template &lt;typename Container&gt; class shared_container_iterator;
+</pre>
+
+The class template <tt>shared_container_iterator</tt> 
+is the shared container iterator type.  The <tt>Container</tt> template
+type argument must model the
+<a href="http://www.sgi.com/tech/stl/Container.html">Container</a>
+concept.
+
+<h3>Example</h3>
+
+<p>
+The following example illustrates how to create an iterator that 
+regulates the lifetime of a reference counted <tt>std::vector</tt>.
+Though the original shared pointer <tt>ints</tt> ceases to exist
+after <tt>set_range()</tt> returns, the
+<tt>shared_counter_iterator</tt> objects maintain references to the
+      underlying vector and thereby extend the container's lifetime.
+<p>
+<a href="./shared_iterator_example1.cpp">shared_iterator_example1.cpp</a>:
+<PRE>
+<font color="#008040">#include "shared_container_iterator.hpp"</font>
+<font color="#008040">#include "boost/shared_ptr.hpp"</font>
+<font color="#008040">#include &lt;algorithm&gt;</font>
+<font color="#008040">#include &lt;iostream&gt;</font>
+<font color="#008040">#include &lt;vector&gt;</font>
+
+<B>typedef</B> boost::shared_container_iterator&lt; std::vector&lt;<B>int</B>&gt; &gt; iterator;
+
+
+<B>void</B> set_range(iterator& i, iterator& end)  {
+
+  boost::shared_ptr&lt; std::vector&lt;<B>int</B>&gt; &gt; ints(<B>new</B> std::vector&lt;<B>int</B>&gt;());
+  
+  ints-&gt;push_back(<font color="#0000A0">0</font>);
+  ints-&gt;push_back(<font color="#0000A0">1</font>);
+  ints-&gt;push_back(<font color="#0000A0">2</font>);
+  ints-&gt;push_back(<font color="#0000A0">3</font>);
+  ints-&gt;push_back(<font color="#0000A0">4</font>);
+  ints-&gt;push_back(<font color="#0000A0">5</font>);
+  
+  i = iterator(ints-&gt;begin(),ints);
+  end = iterator(ints-&gt;end(),ints);
+}
+
+
+<B>int</B> main() {
+
+  iterator i,end;
+
+  set_range(i,end);
+
+  std::copy(i,end,std::ostream_iterator&lt;<B>int</B>&gt;(std::cout,<font color="#0000FF">","</font>));
+  std::cout.put(<font color="#0000FF">'\n'</font>);
+
+  <B>return</B> <font color="#0000A0">0</font>;
+}
+</PRE>
+
+The output from this part is:
+<pre>
+0,1,2,3,4,5,
+</pre>
+
+<h3>Template Parameters</h3>
+
+<Table border>
+<TR>
+<TH>Parameter</TH><TH>Description</TH>
+</TR>
+
+<TR>
+<TD><a
+href="http://www.sgi.com/tech/stl/Container.html"><tt>Container</tt></a></TD>
+<TD>The type of the container that we wish to iterate over. It must be 
+a model of the 
+<a href="http://www.sgi.com/tech/stl/Container.html"><tt>Container</tt></a>
+concept.
+</TD>
+</TR>
+</Table>
+
+<h3>Model of</h3>
+
+The <tt>shared_container_iterator<Container></tt> type models the
+same iterator concept as the base iterator
+    (<tt>Container::iterator</tt>).
+
+<h3>Members</h3>
+
+The shared container iterator type implements the member functions and
+operators required of the <a
+href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access Iterator</a>
+concept, though only operations defined for the base iterator will be valid.
+In addition it has the following constructor:
+
+<pre>
+shared_container_iterator(Container::iterator const&amp; it,
+                          boost::shared_ptr&lt;Container&gt; const&amp; container)
+</pre>
+
+<p>
+<hr>
+<p>
+
+
+<h2><a name="make_iterator">The Shared Container Iterator Object Generator</a></h2>
+
+<pre>
+template &lt;typename Container&gt;
+shared_container_iterator&lt;Container&gt;
+make_shared_container_iterator(Container::iterator base,
+                               boost::shared_ptr&lt;Container&gt; const&amp; container)
+</pre>
+
+This function provides an alternative to directly constructing a
+shared container iterator.  Using the object generator, a shared
+container iterator can be created and passed to a function without
+explicitly specifying its type.
+
+<h3>Example</h3>
+
+This example, similar to the previous, uses 
+<tt>make_shared_container_iterator()</tt> to create the iterators.
+
+<p>
+<a href="./shared_iterator_example2.cpp">shared_iterator_example2.cpp</a>:
+
+<PRE>
+<font color="#008040">#include "shared_container_iterator.hpp"</font>
+<font color="#008040">#include "boost/shared_ptr.hpp"</font>
+<font color="#008040">#include &lt;algorithm&gt;</font>
+<font color="#008040">#include &lt;iterator&gt;</font>
+<font color="#008040">#include &lt;iostream&gt;</font>
+<font color="#008040">#include &lt;vector&gt;</font>
+
+
+<B>template</B> &lt;<B>typename</B> Iterator&gt;
+<B>void</B> print_range_nl (Iterator begin, Iterator end) {
+  <B>typedef</B> <B>typename</B> std::iterator_traits&lt;Iterator&gt;::value_type val;
+  std::copy(begin,end,std::ostream_iterator&lt;val&gt;(std::cout,<font color="#0000FF">","</font>));
+  std::cout.put(<font color="#0000FF">'\n'</font>);
+}
+
+
+<B>int</B> main() {
+
+  <B>typedef</B> boost::shared_ptr&lt; std::vector&lt;<B>int</B>&gt; &gt; ints_t;
+  {
+    ints_t ints(<B>new</B> std::vector&lt;<B>int</B>&gt;());
+
+    ints-&gt;push_back(<font color="#0000A0">0</font>);
+    ints-&gt;push_back(<font color="#0000A0">1</font>);
+    ints-&gt;push_back(<font color="#0000A0">2</font>);
+    ints-&gt;push_back(<font color="#0000A0">3</font>);
+    ints-&gt;push_back(<font color="#0000A0">4</font>);
+    ints-&gt;push_back(<font color="#0000A0">5</font>);
+
+    print_range_nl(boost::make_shared_container_iterator(ints-&gt;begin(),ints),
+		   boost::make_shared_container_iterator(ints-&gt;end(),ints));
+  }
+  
+
+
+  <B>return</B> <font color="#0000A0">0</font>;
+}
+</PRE>
+
+Observe that the <tt>shared_container_iterator</tt> type is never
+explicitly named. The output from this example is the same as the previous.
+
+<h2><a name="make_range">The Shared Container Iterator Range Generator</a></h2>
+
+<pre>
+template &lt;typename Container&gt;
+std::pair&lt
+  shared_container_iterator&lt;Container&gt;,
+  shared_container_iterator&lt;Container&gt;
+&gt;
+make_shared_container_range(boost::shared_ptr&lt;Container&gt; const&amp; container);
+</pre>
+
+Class <tt>shared_container_iterator</tt> is meant primarily to return,
+using iterators, a range of values that we can guarantee will be alive as 
+long as the iterators are. This is a convenience
+function to do just that. It is equivalent to
+
+<pre>
+std::make_pair(make_shared_container_iterator(container-&gt;begin(),container),
+               make_shared_container_iterator(container-&gt;end(),container));
+</pre>
+
+<h3>Example</h3>
+
+In the following example, a range of values is returned as a pair of
+<tt>shared_container_iterator</tt> objects.  
+
+
+<p>
+<a href="./shared_iterator_example3.cpp">shared_iterator_example3.cpp</a>:
+
+<PRE>
+<font color="#008040">#include "shared_container_iterator.hpp"</font>
+<font color="#008040">#include "boost/shared_ptr.hpp"</font>
+<font color="#008040">#include "boost/tuple/tuple.hpp" // for boost::tie</font>
+<font color="#008040">#include &lt;algorithm&gt;              // for std::copy</font>
+<font color="#008040">#include &lt;iostream&gt;              </font>
+<font color="#008040">#include &lt;vector&gt;</font>
+
+
+<B>typedef</B> boost::shared_container_iterator&lt; std::vector&lt;<B>int</B>&gt; &gt; iterator; 
+
+std::pair&lt;iterator,iterator&gt;
+return_range() {
+  boost::shared_ptr&lt; std::vector&lt;<B>int</B>&gt; &gt; range(<B>new</B> std::vector&lt;<B>int</B>&gt;());
+  range-&gt;push_back(<font color="#0000A0">0</font>);
+  range-&gt;push_back(<font color="#0000A0">1</font>);
+  range-&gt;push_back(<font color="#0000A0">2</font>);
+  range-&gt;push_back(<font color="#0000A0">3</font>);
+  range-&gt;push_back(<font color="#0000A0">4</font>);
+  range-&gt;push_back(<font color="#0000A0">5</font>);
+  <B>return</B> boost::make_shared_container_range(range);
+}
+
+
+<B>int</B> main() {
+
+
+  iterator i,end;
+  
+  boost::tie(i,end) = return_range();
+
+  std::copy(i,end,std::ostream_iterator&lt;<B>int</B>&gt;(std::cout,<font color="#0000FF">","</font>));
+  std::cout.put(<font color="#0000FF">'\n'</font>);
+
+  <B>return</B> <font color="#0000A0">0</font>;
+}
+</PRE>
+
+Though the <tt>range</tt> object only lives for the duration of the
+<tt>return_range</tt> call, the reference counted
+<tt>std::vector</tt> will live until <tt>i</tt> and <tt>end</tt>
+are both destroyed.  The output from this example is the same as
+the previous two.
+
+
+<hr>
+<!-- hhmts start -->
+Last modified: Mon Aug 11 11:27:03 EST 2003
+<!-- hhmts end -->
+<p><EFBFBD> Copyright Ronald Garcia 2002. Permission to copy, use,
+modify, sell and distribute this document is granted provided this copyright
+notice appears in all copies. This document is provided &quot;as is&quot;
+without express or implied warranty, and with no claim as to its suitability for
+any purpose.</p>
+
+</body>
+
+</html>
--- a/shared_iterator_example1.cpp
+++ b/shared_iterator_example1.cpp
@ -0,0 +1,41 @@
+// (C) Copyright Ronald Garcia 2002. 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/shared_container_iterator.hpp"
+#include "boost/shared_ptr.hpp"
+#include <algorithm>
+#include <iostream>
+#include <vector>
+
+typedef boost::shared_container_iterator< std::vector<int> > iterator;
+
+
+void set_range(iterator& i, iterator& end)  {
+
+  boost::shared_ptr< std::vector<int> > ints(new std::vector<int>());
+  
+  ints->push_back(0);
+  ints->push_back(1);
+  ints->push_back(2);
+  ints->push_back(3);
+  ints->push_back(4);
+  ints->push_back(5);
+  
+  i = iterator(ints->begin(),ints);
+  end = iterator(ints->end(),ints);
+}
+
+
+int main() {
+
+  iterator i,end;
+
+  set_range(i,end);
+
+  std::copy(i,end,std::ostream_iterator<int>(std::cout,","));
+  std::cout.put('\n');
+
+  return 0;
+}
--- a/shared_iterator_example2.cpp
+++ b/shared_iterator_example2.cpp
@ -0,0 +1,42 @@
+// (C) Copyright Ronald Garcia 2002. 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/shared_container_iterator.hpp"
+#include "boost/shared_ptr.hpp"
+#include <algorithm>
+#include <iterator>
+#include <iostream>
+#include <vector>
+
+
+template <typename Iterator>
+void print_range_nl (Iterator begin, Iterator end) {
+  typedef typename std::iterator_traits<Iterator>::value_type val;
+  std::copy(begin,end,std::ostream_iterator<val>(std::cout,","));
+  std::cout.put('\n');
+}
+
+
+int main() {
+
+  typedef boost::shared_ptr< std::vector<int> > ints_t;
+  {
+    ints_t ints(new std::vector<int>());
+
+    ints->push_back(0);
+    ints->push_back(1);
+    ints->push_back(2);
+    ints->push_back(3);
+    ints->push_back(4);
+    ints->push_back(5);
+
+    print_range_nl(boost::make_shared_container_iterator(ints->begin(),ints),
+                   boost::make_shared_container_iterator(ints->end(),ints));
+  }
+  
+
+
+  return 0;
+}
--- a/shared_iterator_example3.cpp
+++ b/shared_iterator_example3.cpp
@ -0,0 +1,40 @@
+// (C) Copyright Ronald Garcia 2002. 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/shared_container_iterator.hpp"
+#include "boost/shared_ptr.hpp"
+#include "boost/tuple/tuple.hpp" // for boost::tie
+#include <algorithm>              // for std::copy
+#include <iostream>              
+#include <vector>
+
+
+typedef boost::shared_container_iterator< std::vector<int> > iterator;
+
+std::pair<iterator,iterator>
+return_range() {
+  boost::shared_ptr< std::vector<int> > range(new std::vector<int>());
+  range->push_back(0);
+  range->push_back(1);
+  range->push_back(2);
+  range->push_back(3);
+  range->push_back(4);
+  range->push_back(5);
+  return boost::make_shared_container_range(range);
+}
+
+
+int main() {
+
+
+  iterator i,end;
+  
+  boost::tie(i,end) = return_range();
+
+  std::copy(i,end,std::ostream_iterator<int>(std::cout,","));
+  std::cout.put('\n');
+
+  return 0;
+}
--- a/shared_iterator_test.cpp
+++ b/shared_iterator_test.cpp
@ -0,0 +1,53 @@
+// (C) Copyright Ronald Garcia 2003. 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/shared_container_iterator.hpp"
+#include "boost/shared_ptr.hpp"
+#include <vector>
+#include <cassert>
+
+struct resource {
+  static int count;
+  resource() { ++count; }
+  resource(resource const&) { ++count; }
+  ~resource() { --count; }
+};
+int resource::count = 0;
+
+typedef std::vector<resource> resources_t;
+
+typedef boost::shared_container_iterator< resources_t > iterator;
+
+
+void set_range(iterator& i, iterator& end)  {
+
+  boost::shared_ptr< resources_t > objs(new resources_t());
+
+  for (int j = 0; j != 6; ++j)
+    objs->push_back(resource());
+  
+  i = iterator(objs->begin(),objs);
+  end = iterator(objs->end(),objs);
+  assert(resource::count == 6);
+}
+
+
+int main() {
+
+  assert(resource::count == 0);
+  
+  {
+    iterator i;
+    {
+      iterator end;
+      set_range(i,end);
+      assert(resource::count == 6);
+    }
+    assert(resource::count == 6);
+  }
+  assert(resource::count == 0);
+  
+  return 0;
+}
--- a/test/Jamfile
+++ b/test/Jamfile
@ -0,0 +1,43 @@
+# Copyright David Abrahams 2003. 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.
+
+# For more information, see http://www.boost.org/
+
+
+# Testing Jamfile autogenerated from XML source
+subproject libs/utility/test ;
+
+# bring in rules for testing
+import testing ;
+
+# Make tests run by default.
+DEPENDS all : test ;
+
+local test_monitor = <lib>@boost/libs/test/build/boost_test_exec_monitor ;
+
+test-suite utility
+    : 
+        [ run ../iterator_traits_test.cpp ]
+        [ run ../iterators_test.cpp $(test_monitor) ]
+        [ compile-fail ../noncopyable_test.cpp ]
+        [ run ../numeric_traits_test.cpp ]
+        [ run ../operators_test.cpp $(test_monitor) ]
+        [ run ../binary_search_test.cpp $(test_monitor) ]
+        [ run ../call_traits_test.cpp : -u ]
+        [ compile-fail ../checked_delete_test.cpp ]
+        [ run ../compressed_pair_test.cpp $(test_monitor) : -u ]
+        [ run ../addressof_test.cpp $(test_monitor) ]
+        [ run ../ref_test.cpp $(test_monitor) ]
+        [ run ../enable_if_constructors.cpp $(test_monitor) ]
+        [ run ../enable_if_dummy_arg_disambiguation.cpp $(test_monitor) ]
+        [ run ../enable_if_lazy.cpp $(test_monitor) ]
+        [ run ../enable_if_lazy_test.cpp $(test_monitor) ]
+        [ run ../enable_if_member_templates.cpp $(test_monitor) ]
+        [ run ../enable_if_namespace_disambiguation.cpp $(test_monitor) ]
+        [ run ../enable_if_no_disambiguation.cpp $(test_monitor) ]
+        [ run ../enable_if_partial_specializations.cpp $(test_monitor) ]
+        [ run next_prior_test.cpp $(test_monitor) ]          
+    ;
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@ -0,0 +1,33 @@
+# Copyright David Abrahams 2003. 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.
+
+# For more information, see http://www.boost.org/
+
+# bring in rules for testing
+import testing ;
+
+test-suite utility
+    : 
+        [ run ../iterator_traits_test.cpp ]
+        [ run ../iterators_test.cpp ../../test/build//boost_test_exec_monitor ]
+        [ compile-fail ../noncopyable_test.cpp ]
+        [ run ../numeric_traits_test.cpp ]
+        [ run ../operators_test.cpp ../../test/build//boost_test_exec_monitor ]
+        [ run ../binary_search_test.cpp ../../test/build//boost_test_exec_monitor ]
+        [ run ../call_traits_test.cpp : -u ]
+        [ compile-fail ../checked_delete_test.cpp ]
+        [ run ../compressed_pair_test.cpp ../../test/build//boost_test_exec_monitor : -u ]
+        [ run ../addressof_test.cpp ../../test/build//boost_test_exec_monitor ]
+        [ run ../ref_test.cpp ../../test/build//boost_test_exec_monitor ]
+        [ run ../enable_if_constructors.cpp ../../test/build/boost_test_exec_monitor ]
+        [ run ../enable_if_dummy_arg_disambiguation.cpp ../../test/build/boost_test_exec_monitor ]
+        [ run ../enable_if_lazy.cpp ../../test/build/boost_test_exec_monitor ]
+        [ run ../enable_if_lazy_test.cpp ../../test/build/boost_test_exec_monitor ]
+        [ run ../enable_if_member_templates.cpp ../../test/build/boost_test_exec_monitor ]
+        [ run ../enable_if_namespace_disambiguation.cpp ../../test/build/boost_test_exec_monitor ]
+        [ run ../enable_if_no_disambiguation.cpp ../../test/build/boost_test_exec_monitor ]
+        [ run ../enable_if_partial_specializations.cpp ../../test/build/boost_test_exec_monitor ]
+    ;
--- a/test/next_prior_test.cpp
+++ b/test/next_prior_test.cpp
@ -0,0 +1,79 @@
+// Boost test program for next() and prior() utilities.
+
+// Copyright 2003 Daniel Walker.  Use, modification, and distribution
+// are subject to the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or a copy at
+// http://www.boost.org/LICENSE_1_0.txt.)
+
+// See http://www.boost.org/libs/utility for documentation.
+
+// Revision History 13 Dec 2003 Initial Version (Daniel Walker)
+
+// next() and prior() are replacements for operator+ and operator- for
+// non-random-access iterators. The semantics of these operators are
+// such that after executing j = i + n, std::distance(i, j) equals
+// n. Tests are provided to ensure next() has the same
+// result. Parallel tests are provided for prior(). The tests call
+// next() and prior() several times. next() and prior() are very
+// simple functions, though, and it would be very strange if these
+// tests were to fail.
+
+#define BOOST_INCLUDE_MAIN
+#include <boost/test/test_tools.hpp>
+
+#include <list>
+#include <vector>
+
+#include <boost/next_prior.hpp>
+
+template<class RandomAccessIterator, class ForwardIterator>
+bool plus_one_test(RandomAccessIterator first, RandomAccessIterator last, ForwardIterator first2)
+{
+    RandomAccessIterator i = first;
+    ForwardIterator j = first2;
+    while(i != last)
+        i = i + 1, j = boost::next(j);
+    return std::distance(first, i) == std::distance(first2, j);
+}
+
+template<class RandomAccessIterator, class ForwardIterator>
+bool plus_n_test(RandomAccessIterator first, RandomAccessIterator last, ForwardIterator first2)
+{
+    RandomAccessIterator i = first;
+    ForwardIterator j = first2;
+    for(int n = 0; i != last; ++n)
+        i = first + n, j = boost::next(first2, n);
+    return std::distance(first, i) == std::distance(first2, j);
+}
+
+template<class RandomAccessIterator, class BidirectionalIterator>
+bool minus_one_test(RandomAccessIterator first, RandomAccessIterator last, BidirectionalIterator last2)
+{
+    RandomAccessIterator i = last;
+    BidirectionalIterator j = last2;
+    while(i != first)
+        i = i - 1, j = boost::prior(j);
+    return std::distance(i, last) == std::distance(j, last2);
+}
+
+template<class RandomAccessIterator, class BidirectionalIterator>
+bool minus_n_test(RandomAccessIterator first, RandomAccessIterator last, BidirectionalIterator last2)
+{
+    RandomAccessIterator i = last;
+    BidirectionalIterator j = last2;
+    for(int n = 0; i != first; ++n)
+        i = last - n, j = boost::prior(last2, n);
+    return std::distance(i, last) == std::distance(j, last2);
+}
+
+int test_main(int, char*[])
+{
+    std::vector<int> x(8);
+    std::list<int> y(x.begin(), x.end());
+
+    BOOST_REQUIRE(plus_one_test(x.begin(), x.end(), y.begin()));
+    BOOST_REQUIRE(plus_n_test(x.begin(), x.end(), y.begin()));
+    BOOST_REQUIRE(minus_one_test(x.begin(), x.end(), y.end()));
+    BOOST_REQUIRE(minus_n_test(x.begin(), x.end(), y.end()));
+    return 0;
+}
--- a/throw_exception.html
+++ b/throw_exception.html
@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+		<title>Boost: throw_exception.hpp documentation</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	</head>
+	<body bgcolor="white" style="MARGIN-LEFT: 5%; MARGIN-RIGHT: 5%">
+		<table border="0" width="100%">
+			<tr>
+				<td width="277">
+					<img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" width="277" height="86">
+				</td>
+				<td align="middle">
+					<h1>throw_exception.hpp</h1>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2" height="64">&nbsp;</td>
+			</tr>
+		</table>
+		<p>
+			The header <STRONG>&lt;boost/throw_exception.hpp&gt;</STRONG> defines the 
+			helper function <STRONG>boost::throw_exception</STRONG>. It is intended to be 
+			used in Boost libraries that need to throw exceptions, but support 
+			configurations and platforms where exceptions aren't available, as indicated by 
+			the presence of the <STRONG>BOOST_NO_EXCEPTIONS</STRONG> <A href="../config/config.htm#macro_ref">
+				configuration macro</A>.
+		</p>
+		<P>When <STRONG>BOOST_NO_EXCEPTIONS</STRONG> is not defined, <tt>boost::throw_exception(e)</tt>
+			is equivalent to <tt>throw e</tt>. Otherwise, the function is left undefined, 
+			and the user is expected to supply an appropriate definition. Callers of <tt>throw_exception</tt>
+			are allowed to assume that the function never returns; therefore, if the 
+			user-defined <tt>throw_exception</tt> returns, the behavior is undefined.</P>
+		<h3><a name="Synopsis">Synopsis</a></h3>
+		<pre>
+namespace boost
+{
+
+#ifdef BOOST_NO_EXCEPTIONS
+
+void throw_exception(std::exception const &amp; e); // user defined
+
+#else
+
+template&lt;class E&gt; void throw_exception(E const &amp; e)
+{
+    throw e;
+}
+
+#endif
+
+}
+</pre>
+		<p><br>
+			<small>Copyright <20> 2002 by Peter Dimov. Permission to copy, use, modify, sell and 
+				distribute this document is granted provided this copyright notice appears in 
+				all copies. This document is provided "as is" without express or implied 
+				warranty, and with no claim as to its suitability for any purpose.</small></p>
+	</body>
+</html>
--- a/tie.html
+++ b/tie.html
@ -1,143 +0,0 @@
-<HTML>
-<!--
-  -- Copyright (c) Jeremy Siek, Lie-Quan Lee, and Andrew Lumsdaine  2000
-  --
-  -- Permission to use, copy, modify, distribute and sell this software
-  -- and its documentation for any purpose is hereby granted without fee,
-  -- provided that the above copyright notice appears in all copies and
-  -- that both that copyright notice and this permission notice appear
-  -- in supporting documentation.  We make no
-  -- representations about the suitability of this software for any
-  -- purpose.  It is provided "as is" without express or implied warranty.
-  -->
-<Head>
-<Title>Boost Tie</Title>
-<BODY BGCOLOR="#ffffff" LINK="#0000ee" TEXT="#000000" VLINK="#551a8b" 
-	ALINK="#ff0000"> 
-<IMG SRC="../../c++boost.gif" 
-     ALT="C++ Boost" width="277" height="86"> 
-
-<BR Clear>
-
-<H1><A NAME="sec:tie"></A>
-<TT>tie</TT>
-</H1>
-
-<h3>
-[This version of tie has been removed from the utility.hpp
-header.&nbsp; There is a new, more general version of <a
-href="../tuple/doc/tuple_users_guide.html#tiers">tie</a> in the Boost
-Tuples Library. The more general version handles an (almost) arbitrary
-number of arguments, instead of just two. The version in utility.hpp
-had to be removed to avoid name clashes.]</h3>
-<PRE>
-template &lt;class A, class B&gt;
-tied&lt;A,B&gt; tie(A&amp; a, B&amp; b);
-</PRE>
-
-<P>
-This is a utility function that makes it more convenient to work with
-a function which returns a std::pair&lt;&gt;. The effect of the <TT>tie()</TT>
-function is to allow the assignment of the two values of the pair to
-two separate variables. The idea for this comes from Jaakko
-J&#228;rvi's Binders&nbsp;[<A
-HREF="../graph/doc/bibliography.html#jaakko_tuple_assign">1</A>].
-
-<P>
-
-<H3>Where Defined</H3>
-
-<P>
-<a href="../../boost/utility.hpp"><TT>boost/utility.hpp</TT></a>
-
-<P>
-
-<H3>Example</H3>
-
-<P>
-An example of using the <TT>tie()</TT> function with the
-<TT>vertices()</TT> function, which returns a pair of
-type <TT>std::pair&lt;vertex_iterator,vertex_iterator&gt;</TT>.  The
-pair of iterators is assigned to the iterator variables <TT>i</TT> and
-<TT>end</TT>.
-
-<P>
-<PRE>
-  graph_traits&lt; adjacency_list&lt;&gt; &gt;::vertex_iterator i, end;
-  for(tie(i,end) = vertices(G); i != end; ++i)
-    // ...
-</PRE>
-
-<P>
-Here is another example that uses <TT>tie()</TT> for handling operations with <a
-href="http://www.sgi.com/tech/stl/set.html"><TT>std::set</TT></a>.
-
-<P>
-<PRE>
-#include &lt;set&gt;
-#include &lt;algorithm&gt;
-#include &lt;iostream&gt;
-#include &lt;boost/utility.hpp&gt;
-
-int
-main(int, char*[])
-{
-  {
-    typedef std::set&lt;int&gt; SetT;
-    SetT::iterator i, end;
-    bool inserted;
-    
-    int vals[5] = { 5, 2, 4, 9, 1 };
-    SetT s(vals, vals + 5);
-    
-    // Using tie() with a return value of pair&lt;iterator,bool&gt;
-
-    int new_vals[2] = { 3, 9 };
-
-    for (int k = 0; k &lt; 2; ++k) {
-      boost::tie(i,inserted) = s.insert(new_vals[k]);
-      if (!inserted)
-        std::cout &lt;&lt; *i &lt;&lt; &quot; was already in the set.&quot; &lt;&lt; std::endl;
-      else
-        std::cout &lt;&lt; *i &lt;&lt; &quot; successfully inserted.&quot; &lt;&lt; std::endl;    
-    }
-  }    
-  {
-    int* i, *end;
-    int vals[6] = { 5, 2, 4, 4, 9, 1 };
-    std::sort(vals, vals + 6);
-
-    // Using tie() with a return value of pair&lt;iterator,iterator&gt;
-
-    boost::tie(i,end) = std::equal_range(vals, vals + 6, 4);
-    std::cout &lt;&lt; &quot;There were &quot; &lt;&lt; std::distance(i,end)
-              &lt;&lt; &quot; occurrences of &quot; &lt;&lt; *i &lt;&lt; &quot;.&quot; &lt;&lt; std::endl;
-    // Footnote: of course one would normally just use std::count()
-    // to get this information, but that would spoil the example :)
-  }
-  return 0;
-}
-</PRE>
-The output is:
-<PRE>
-  3 successfully inserted.
-  9 was already in the set.
-  There were 2 occurrences of 4.
-</PRE>
-
-<br>
-<HR>
-<TABLE>
-<TR valign=top>
-<TD nowrap>Copyright &copy 2000</TD><TD>
-<a HREF="../../people/jeremy_siek.htm">Jeremy Siek</a>,
-Univ.of Notre Dame (<A
-HREF="mailto:jsiek@lsc.nd.edu">jsiek@lsc.nd.edu</A>)<br>
-<A HREF=http://www.lsc.nd.edu/~llee1>Lie-Quan Lee</A>, Univ.of Notre Dame (<A HREF="mailto:llee1@lsc.nd.edu">llee1@lsc.nd.edu</A>)<br>
-<A HREF=http://www.lsc.nd.edu/~lums>Andrew Lumsdaine</A>,
-Univ.of Notre Dame (<A
-HREF="mailto:lums@lsc.nd.edu">lums@lsc.nd.edu</A>)
-</TD></TR></TABLE>
-
-</BODY>
-</HTML> 
--- a/tie_example.cpp
+++ b/tie_example.cpp
@ -1,63 +0,0 @@
-//  (C) Copyright Jeremy Siek 2000. 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.
-//
-// This is an example demonstrating how to use the tie() function.
-// The purpose of tie() is to make it easiery to deal with std::pair
-// return values.
-//
-// Contributed by Jeremy Siek
-//
-// Sample output
-//
-// 3 successfully inserted.
-// 9 was already in the set.
-// There were 2 occurrences of 4.
-
-#include <set>
-#include <algorithm>
-#include <iostream>
-// Note: tie() use to live in boost/utility.hpp, but
-// not it is part of the more general Boost Tuple Library.
-#include <boost/tuple/tuple.hpp>
-
-int
-main(int, char*[])
-{
-  {
-    typedef std::set<int> SetT;
-    SetT::iterator i;
-    bool inserted;
-    
-    int vals[5] = { 5, 2, 4, 9, 1 };
-    SetT s(vals, vals + 5);
-    
-    // Using tie() with a return value of pair<iterator,bool>
-
-    int new_vals[2] = { 3, 9 };
-
-    for (int k = 0; k < 2; ++k) {
-      boost::tie(i,inserted) = s.insert(new_vals[k]);
-      if (!inserted)
-        std::cout << *i << " was already in the set." << std::endl;
-      else
-        std::cout << *i << " successfully inserted." << std::endl;    
-    }
-  }    
-  {
-    int* i, *end;
-    int vals[6] = { 5, 2, 4, 4, 9, 1 };
-    std::sort(vals, vals + 6);
-
-    // Using tie() with a return value of pair<iterator,iterator>
-
-    boost::tie(i,end) = std::equal_range(vals, vals + 6, 4);
-    std::cout << "There were " << std::distance(i,end)
-              << " occurrences of " << *i << "." << std::endl;
-    // Footnote: of course one would normally just use std::count()
-    // to get this information, but that would spoil the example :)
-  }
-  return 0;
-}
--- a/transform_iterator.htm
+++ b/transform_iterator.htm
@ -1,223 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Transform Iterator Adaptor Documentation</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-<img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)"
-align="center" width="277" height="86">
-
-<h1>Transform Iterator Adaptor</h1>
-
-Defined in header
-<a href="../../boost/iterator_adaptors.hpp">boost/iterator_adaptors.hpp</a>
-
-<p>
-The transform iterator adaptor augments an iterator by applying some
-function object to the result of dereferencing the iterator. Another
-words, the <tt>operator*</tt> of the transform iterator first
-dereferences the base iterator, passes the result of this to the
-function object, and then returns the result. The following
-<b>pseudo-code</b> shows the basic idea:
-
-<pre>
-  value_type transform_iterator::operator*() const {
-    return this->f(*this->base_iterator);
-  }
-</pre>
-
-All of the other operators of the transform iterator behave in the
-same fashion as those of the base iterator.
-
-
-<h2>Synopsis</h2>
-
-<pre>
-namespace boost {
-  template &lt;class <a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>, class BaseIterator&gt;
-  class transform_iterator_generator;
-
-  template &lt;class <a href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html">AdaptableUnaryFunction</a>, class BaseIterator&gt;
-  typename transform_iterator_generator&lt;AdaptableUnaryFunction,Iterator&gt;::type
-  make_transform_iterator(BaseIterator base, const AdaptableUnaryFunction&amp; f = AdaptableUnaryFunction());
-}
-</pre>
-
-<hr>
-
-<h2><a name="transform_iterator_generator">The Transform Iterator Type
-Generator</a></h2>
-
-The class <tt>transform_iterator_generator</tt> is a helper class whose
-purpose is to construct a transform iterator type.  The template
-parameters for this class are the <tt>AdaptableUnaryFunction</tt> function object
-type and the <tt>BaseIterator</tt> type that is being wrapped.
-
-<pre>
-template &lt;class AdaptableUnaryFunction, class Iterator&gt;
-class transform_iterator_generator
-{
-public:
-    typedef <a href="./iterator_adaptors.htm#iterator_adaptor">iterator_adaptor</a>&lt;...&gt; type;
-};
-</pre>
-
-<h3>Example</h3>
-
-<p>
-The following is an example of how to use the
-<tt>transform_iterator_generator</tt> class to iterate through a range
-of numbers, multiplying each of them by 2 when they are dereferenced.
-The <tt>boost::binder1st</tt> class is used instead of the standard
-one because tranform iterator requires the function object to be
-Default Constructible.
-
-<p>
-<PRE>
-#include &lt;functional&gt;
-#include &lt;iostream&gt;
-#include &lt;boost/iterator_adaptors.hpp&gt;
-
-// definition of class boost::binder1st and function boost::bind1st() ...
-
-int
-main(int, char*[])
-{
-  int x[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
-
-  typedef boost::binder1st&lt; std::multiplies&lt;int&gt; &gt; Function;
-  typedef boost::transform_iterator_generator&lt;Function, int*&gt;::type doubling_iterator;
-
-  doubling_iterator i(x, boost::bind1st(std::multiplies&lt;int&gt;(), 2)),
-    i_end(x + sizeof(x)/sizeof(int), boost::bind1st(std::multiplies&lt;int&gt;(), 2));
-
-  std::cout &lt;&lt; "multiplying the array by 2:" &lt;&lt; std::endl;
-  while (i != i_end)
-    std::cout &lt;&lt; *i++ &lt;&lt; " ";
-  std::cout &lt;&lt; std::endl;
-
-  // to be continued...
-</PRE>
-The output from this part is:
-<pre>
-2 4 6 8 10 12 14 16
-</pre>
-
-<h3>Template Parameters</h3>
-
-<Table border>
-<TR>
-<TH>Parameter</TH><TH>Description</TH>
-</TR>
-
-<TR>
-<TD><a
-href="http://www.sgi.com/tech/stl/AdaptableUnaryFunction.html"><tt>AdaptableUnaryFunction</tt></a></TD>
-<TD>The function object that transforms each element in the iterator
-range.  The <tt>argument_type</tt> of the function object must match
-the value type of the base iterator.  The <tt>result_type</tt> of the
-function object will be the resulting iterator's
-<tt>value_type</tt>. If you want the resulting iterator to behave as
-an iterator, the result of the function should be solely a function of
-its argument. Also, the function object must be <a
-href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> Default
-Constructible</a> (which many of the standard function objects are not).</TD>
-</TR>
-
-<TR>
-<TD><tt>BaseIterator</tt></TD>
-<TD>The iterator type being wrapped. This type must at least be a model
- of the <a href="http://www.sgi.com/tech/stl/InputIterator">InputIterator</a> concept.</TD>
-</TR>
-
-</Table>
-
-<h3>Model of</h3>
-
-The transform iterator adaptor (the type
-<tt>transform_iterator_generator<...>::type</tt>) is a model of <a
-href="http://www.sgi.com/tech/stl/InputIterator.html">Input Iterator</a><a href="#1">[1]</a>.
-
-
-<h3>Members</h3>
-
-The transform iterator type implements the member functions and
-operators required of the <a
-href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access Iterator</a>
-concept, except that the <tt>reference</tt> type is the same as the <tt>value_type</tt>
-so <tt>operator*()</tt> returns by-value. In addition it has the following constructor:
-
-<pre>
-transform_iterator_generator::type(const BaseIterator&amp; it,
-                                   const AdaptableUnaryFunction&amp; f = AdaptableUnaryFunction())
-</pre>
-
-<p>
-<hr>
-<p>
-
-
-<h2><a name="make_transform_iterator">The Transform Iterator Object Generator</a></h2>
-
-<pre>
-template &lt;class AdaptableUnaryFunction, class BaseIterator&gt;
-typename transform_iterator_generator&lt;AdaptableUnaryFunction,BaseIterator&gt;::type
-make_transform_iterator(BaseIterator base,
-                        const AdaptableUnaryFunction&amp; f = AdaptableUnaryFunction());
-</pre>
-
-This function provides a convenient way to create transform iterators.
-
-<h3>Example</h3>
-
-Continuing from the previous example, we use the <tt>make_transform_iterator()</tt>
-function to add four to each element of the array.
-
-<pre>
-  std::cout << "adding 4 to each element in the array:" << std::endl;
-
-  std::copy(boost::make_transform_iterator(x, boost::bind1st(std::plus<int>(), 4)),
-	    boost::make_transform_iterator(x + N, boost::bind1st(std::plus<int>(), 4)),
-	    std::ostream_iterator<int>(std::cout, " "));
-  std::cout << std::endl;
-
-  return 0;
-}
-</pre>
-The output from this part is:
-<pre>
-5 6 7 8 9 10 11 12
-</pre>
-
-<h3>Notes</h3>
-
-
-<a name="1">[1]</a> If the base iterator is a model of <a
-href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access Iterator</a>
-then the transform iterator will also suppport most of the
-functionality required by the Random Access Iterator concept. However, a
-transform iterator can never completely satisfy the requirements for
-<a
-href="http://www.sgi.com/tech/stl/ForwardIterator.html">Forward Iterator</a>
-(or of any concepts that refine Forward Iterator, which includes
-Random Access Iterator and Bidirectional Iterator) since the <tt>operator*</tt> of the transform
-iterator always returns by-value.
-
-
-
-<hr>
-<p>Revised <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->19 Aug 2001<!--webbot bot="Timestamp" endspan i-checksum="14767" --></p>
-<p><EFBFBD> Copyright Jeremy Siek 2000. Permission to copy, use,
-modify, sell and distribute this document is granted provided this copyright
-notice appears in all copies. This document is provided &quot;as is&quot;
-without express or implied warranty, and with no claim as to its suitability for
-any purpose.</p>
-
-</body>
-
-</html>
--- a/transform_iterator_example.cpp
+++ b/transform_iterator_example.cpp
@ -7,7 +7,7 @@
 #include <functional>
 #include <algorithm>
 #include <iostream>
-#include <boost/iterator_adaptors.hpp>
+#include <boost/iterator/transform_iterator.hpp>

 // What a bummer. We can't use std::binder1st with transform iterator
 // because it does not have a default constructor. Here's a version
@ -53,7 +53,7 @@ main(int, char*[])
  const int N = sizeof(x)/sizeof(int);

  typedef boost::binder1st< std::multiplies<int> > Function;
-  typedef boost::transform_iterator_generator<Function, int*>::type doubling_iterator;
+  typedef boost::transform_iterator<Function, int*> doubling_iterator;

  doubling_iterator i(x, boost::bind1st(std::multiplies<int>(), 2)),
    i_end(x + N, boost::bind1st(std::multiplies<int>(), 2));
--- a/transform_iterator_test.cpp
+++ b/transform_iterator_test.cpp
@ -1,54 +0,0 @@
-//  (C) Copyright Jeremy Siek 1999. 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.
-
-//  Revision History
-//  08 Mar 2001   Jeremy Siek
-//       Moved test of transform iterator into its own file. It to
-//       to be in iterator_adaptor_test.cpp.
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <algorithm>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/pending/iterator_tests.hpp>
-
-struct mult_functor {
-  typedef int result_type;
-  typedef int argument_type;
-  // Functors used with transform_iterator must be
-  // DefaultConstructible, as the transform_iterator must be
-  // DefaultConstructible to satisfy the requirements for
-  // TrivialIterator.
-  mult_functor() { }
-  mult_functor(int aa) : a(aa) { }
-  int operator()(int b) const { return a * b; }
-  int a;
-};
-
-int
-main()
-{
-  const int N = 10;
-
-  // Borland is getting confused about typedef's and constructors here
-
-  // Test transform_iterator
-  {
-    int x[N], y[N];
-    for (int k = 0; k < N; ++k)
-      x[k] = k;
-    std::copy(x, x + N, y);
-
-    for (int k2 = 0; k2 < N; ++k2)
-      x[k2] = x[k2] * 2;
-
-    boost::transform_iterator_generator<mult_functor, int*>::type i(y, mult_functor(2));
-    boost::input_iterator_test(i, x[0], x[1]);
-    boost::input_iterator_test(boost::make_transform_iterator(&y[0], mult_functor(2)), x[0], x[1]);
-  }
-  std::cout << "test successful " << std::endl;
-  return 0;
-}
--- a/utility.htm
+++ b/utility.htm
@ -1,150 +1,151 @@
 <html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Header boost/utility.hpp Documentation</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-<h1><img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" align="center" WIDTH="277" HEIGHT="86">Header
-<a href="../../boost/utility.hpp">boost/utility.hpp</a></h1>
-
-<p>The entire contents of the header <code><a href="../../boost/utility.hpp">&lt;boost/utility.hpp&gt;</a></code>
- are in <code>namespace boost</code>.</p>
-
-<h2>Contents</h2>
-
-<ul>
-  <li>Class templates supporting the <a href="base_from_member.html">base-from-member
-    idiom</a></li>
-  <li>Function templates <a href="#checked_delete">checked_delete() and
-    checked_array_delete()</a></li>
-  <li>Function templates <a href="#functions next">next() and prior()</a></li>
-  <li>Class <a href="#Class noncopyable">noncopyable</a></li>
-  <li>Function template <a href="tie.html">tie()</a> and supporting class tied.</li>
-</ul>
-<h2> Function templates <a name="checked_delete">checked_delete</a>() and
-checked_array_delete()</h2>
-
-<p>Deletion of a pointer to an incomplete type is an unsafe programming practice
-because there is no way for the compiler to verify that the destructor is indeed
-trivial.&nbsp; The checked_delete() and checked_array_delete() function
-templates simply <b>delete</b> or <b>delete[]</b> their argument, but also
-require that their argument be a complete type.&nbsp; They issue an appropriate
-compiler error diagnostic if that requirement is not met.&nbsp; A typical
-implementation is shown; other implementations may vary:</p>
-
-<pre>    template&lt; typename T &gt;
-    inline void checked_delete(T const volatile * x)
-    {
-        BOOST_STATIC_ASSERT( sizeof(T) ); // assert type complete at point
-                                          // of instantiation
-        delete x;
-    }
-
-    template&lt; typename T &gt;
-    inline void checked_array_delete(T const volatile * x)
-    {
-        BOOST_STATIC_ASSERT( sizeof(T) ); // assert type complete at point
-                                          // of instantiation
-        delete [] x;
-    }</pre>
-
-<p>Contributed by Beman Dawes, based on a suggestion from Dave Abrahams,
-generalizing an idea from Vladimir Prus, with comments from Rainer Deyke, John
-Maddock, and others.</p>
-
-<h3>Background</h3>
-
-<p>The C++ Standard specifies that delete on a pointer to an incomplete types is
-undefined behavior if the type has a non-trivial destructor in&nbsp; [expr.delete]
-5.3.5 paragraph.&nbsp; No diagnostic is required.&nbsp; Some but not all
-compilers issue warnings if the type is incomplete at point of deletion.</p>
-
-<h2> <a name="functions next">Function</a> templates next() and prior()</h2>
-
-<p>Certain data types, such as the C++ Standard Library's forward and
-bidirectional iterators, do not provide addition and subtraction via operator+()
-or operator-().&nbsp; This means that non-modifying computation of the next or
-prior value requires a temporary, even though operator++() or operator--() is
-provided.&nbsp; It also means that writing code like <code>itr+1</code> inside a
-template restricts the iterator category to random access iterators.</p>
-
-<p>The next() and prior() functions provide a simple way around these problems:</p>
-
-<blockquote>
-
-<pre>template &lt;class T&gt;
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+		<title>Header boost/utility.hpp Documentation</title>
+	</head>
+	<body bgcolor="#FFFFFF" text="#000000">
+		<h1><img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" align="center" WIDTH="277" HEIGHT="86">Header
+			<a href="../../boost/utility.hpp">boost/utility.hpp</a></h1>
+		<p>The entire contents of the header <code><a href="../../boost/utility.hpp">&lt;boost/utility.hpp&gt;</a></code>
+			are in <code>namespace boost</code>.</p>
+		<h2>Contents</h2>
+		<ul>
+			<li>
+				Class templates supporting the <a href="base_from_member.html">base-from-member 
+					idiom</a></li>
+			<li>
+				Function templates <a href="#checked_delete">checked_delete() and 
+					checked_array_delete()</a></li>
+			<li>
+				Function templates <a href="#functions_next_prior">next() and prior()</a></li>
+			<li>
+				Class <a href="#Class_noncopyable">noncopyable</a></li>
+			<li>
+				Function template <a href="#addressof">addressof()</a></li>
+		</ul>
+		<h2>
+			Function templates <a name="checked_delete">checked_delete</a>() and 
+			checked_array_delete()</h2>
+		<p>See <a href="checked_delete.html">separate documentation</a>.</p>
+		<h2>
+			<a name="functions_next_prior">Function</a> templates next() and prior()</h2>
+		<p>Certain data types, such as the C++ Standard Library's forward and bidirectional 
+			iterators, do not provide addition and subtraction via operator+() or 
+			operator-().&nbsp; This means that non-modifying computation of the next or 
+			prior value requires a temporary, even though operator++() or operator--() is 
+			provided.&nbsp; It also means that writing code like <code>itr+1</code> inside 
+			a template restricts the iterator category to random access iterators.</p>
+		<p>The next() and prior() functions provide a simple way around these problems:</p>
+		<blockquote>
+			<pre>template &lt;class T&gt;
 T next(T x) { return ++x; }

-template &lt;class X&gt;
-T prior(T x) { return --x; }</pre>
+template &lt;class T, class Distance&gt;
+T next(T x, Distance n)
+{
+    std::advance(x, n);
+    return x;
+}

-</blockquote>
+template &lt;class T&gt;
+T prior(T x) { return --x; }

-<p>Usage is simple:</p>
-
-<blockquote>
-
-<pre>const std::list&lt;T&gt;::iterator p = get_some_iterator();
-const std::list&lt;T&gt;::iterator prev = boost::prior(p);</pre>
-
-</blockquote>
-
-<p>Contributed by <a href="../../people/dave_abrahams.htm">Dave Abrahams</a>.</p>
-
-<h2><a name="Class noncopyable">Class noncopyable</a></h2>
-
-<p>Class <strong>noncopyable</strong> is a base class.&nbsp; Derive your own class from <strong>noncopyable</strong>
-when you want to prohibit copy construction and copy assignment.</p>
-
-<p>Some objects, particularly those which hold complex resources like files or
-network connections, have no sensible copy semantics.&nbsp; Sometimes there are
-possible copy semantics, but these would be of very limited usefulness and be
-very difficult to implement correctly.&nbsp; Sometimes you're implementing a class that doesn't need to be copied
-just yet and you don't want to take the time to write the appropriate functions.&nbsp;
-Deriving from <b> noncopyable</b> will prevent the otherwise implicitly-generated
-functions (which don't have the proper semantics) from becoming a trap for other programmers.</p>
-
-<p>The traditional way to deal with these is to declare a private copy constructor and copy assignment, and then
-document why this is done.&nbsp; But deriving from <b>noncopyable</b> is simpler
-and clearer, and doesn't require additional documentation.</p>
-
-<p>The program <a href="noncopyable_test.cpp">noncopyable_test.cpp</a> can be
-used to verify class <b>noncopyable</b> works as expected. It has have been run successfully under
-GCC 2.95, Metrowerks
-CodeWarrior 5.0, and Microsoft Visual C++ 6.0 sp 3.</p>
-
-<p>Contributed by <a href="../../people/dave_abrahams.htm">Dave Abrahams</a>.</p>
-
-<h3>Example</h3>
-<blockquote>
-  <pre>// inside one of your own headers ...
+template &lt;class T, class Distance&gt;
+T prior(T x, Distance n)
+{
+    std::advance(x, -n);
+    return x;
+}</pre>
+		</blockquote>
+		<p>Usage is simple:</p>
+		<blockquote>
+			<pre>const std::list&lt;T&gt;::iterator p = get_some_iterator();
+const std::list&lt;T&gt;::iterator prev = boost::prior(p);
+const std::list&lt;T&gt;::iterator next = boost::next(prev, 2);</pre>
+		</blockquote>
+                <p>The distance from the given iterator should be supplied as an absolute value. For
+			example, the iterator four iterators prior to the given iterator <code>p</code>
+			may be obtained by <code>prior(p, 4)</code>.</p>
+		<p>Contributed by <a href="../../people/dave_abrahams.htm">Dave Abrahams</a>.  Two-argument versions by Daniel Walker.</p>
+		<h2><a name="Class_noncopyable">Class noncopyable</a></h2>
+		<p>Class <strong>noncopyable</strong> is a base class.&nbsp; Derive your own class 
+			from <strong>noncopyable</strong> when you want to prohibit copy construction 
+			and copy assignment.</p>
+		<p>Some objects, particularly those which hold complex resources like files or 
+			network connections, have no sensible copy semantics.&nbsp; Sometimes there are 
+			possible copy semantics, but these would be of very limited usefulness and be 
+			very difficult to implement correctly.&nbsp; Sometimes you're implementing a 
+			class that doesn't need to be copied just yet and you don't want to take the 
+			time to write the appropriate functions.&nbsp; Deriving from <b>noncopyable</b> 
+			will prevent the otherwise implicitly-generated functions (which don't have the 
+			proper semantics) from becoming a trap for other programmers.</p>
+		<p>The traditional way to deal with these is to declare a private copy constructor 
+			and copy assignment, and then document why this is done.&nbsp; But deriving 
+			from <b>noncopyable</b> is simpler and clearer, and doesn't require additional 
+			documentation.</p>
+		<p>The program <a href="noncopyable_test.cpp">noncopyable_test.cpp</a> can be used 
+			to verify class <b>noncopyable</b> works as expected. It has have been run 
+			successfully under GCC 2.95, Metrowerks CodeWarrior 5.0, and Microsoft Visual 
+			C++ 6.0 sp 3.</p>
+		<p>Contributed by <a href="../../people/dave_abrahams.htm">Dave Abrahams</a>.</p>
+		<h3>Example</h3>
+		<blockquote>
+			<pre>// inside one of your own headers ...
 #include &lt;boost/utility.hpp&gt;

 class ResourceLadenFileSystem : boost::noncopyable {
 ...</pre>
-</blockquote>
+		</blockquote>
+		<h3>Rationale</h3>
+		<p>Class noncopyable has protected constructor and destructor members to emphasize 
+			that it is to be used only as a base class.&nbsp; Dave Abrahams notes concern 
+			about the effect on compiler optimization of adding (even trivial inline) 
+			destructor declarations. He says &quot;Probably this concern is misplaced, 
+			because noncopyable will be used mostly for classes which own resources and 
+			thus have non-trivial destruction semantics.&quot;</p>
+		<h2><a name="addressof">Function template addressof()</a></h2>
+		<p>Function <strong>addressof()</strong> returns the address of an object.</p>
+		<blockquote>
+			<pre>template &lt;typename T&gt; inline T*                addressof(T& v);
+template &lt;typename T&gt; inline const T*          addressof(const T& v);
+template &lt;typename T&gt; inline volatile T*       addressof(volatile T& v);
+template &lt;typename T&gt; inline const volatile T* addressof(const volatile T& v);
+</pre>
+		</blockquote>
+		<p>C++ allows programmers to replace the unary <strong>operator&()</strong> class 
+			member used to get the address of an object. Getting the real address of an 
+			object requires ugly casting tricks to avoid invoking the overloaded <strong>operator&()</strong>. 
+			Function <strong>addressof()</strong> provides a wrapper around the necessary 
+			code to make it easy to get an object's real address.
+		</p>
+		<p>The program <a href="addressof_test.cpp">addressof_test.cpp</a> can be used to 
+			verify that <b>addressof()</b> works as expected.</p>
+		<p>Contributed by Brad King based on ideas from discussion with Doug Gregor.</p>
+		<h3>Example</h3>
+		<blockquote>
+			<pre>#include &lt;boost/utility.hpp&gt;

-<h3>Rationale</h3>
-<p>Class noncopyable has protected constructor and destructor members to
-emphasize that it is to be used only as a base class.&nbsp; Dave Abrahams notes
-concern about the effect on compiler optimization of adding (even trivial inline)
-destructor declarations. He says &quot;Probably this concern is misplaced, because
-noncopyable will be used mostly for classes which own resources and thus have non-trivial destruction semantics.&quot;</p>
-<h2>Class templates for the Base-from-Member Idiom</h2>
-<p>See <a href="base_from_member.html">separate documentation</a>.</p>
-<h2>Function template tie()</h2>
-<p>See <a href="tie.html">separate documentation</a>.</p>
-<hr>
-<p>Revised&nbsp; <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan
-->10 September, 2001<!--webbot bot="Timestamp" endspan i-checksum="39328"
+struct useless_type {};
+class nonaddressable {
+  useless_type operator&() const;
+};
+
+void f() {
+  nonaddressable x;
+  nonaddressable* xp = boost::addressof(x);
+  // nonaddressable* xpe = &amp;x; /* error */
+}</pre>
+		</blockquote>
+		<h2>Class templates for the Base-from-Member Idiom</h2>
+		<p>See <a href="base_from_member.html">separate documentation</a>.</p>
+		<hr>
+		<p>Revised&nbsp; <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan
+-->23 December, 2003<!--webbot bot="Timestamp" endspan i-checksum="38582"
 -->
-</p>
-<p><EFBFBD> Copyright boost.org 1999. Permission to copy, use, modify, sell and
-distribute this document is granted provided this copyright notice appears in
-all copies. This document is provided &quot;as is&quot; without express or
-implied warranty, and with no claim as to its suitability for any purpose.</p>
-</body>
+		</p>
+		<p>&copy; Copyright boost.org 1999-2003. Permission to copy, use, modify, sell and distribute 
+			this document is granted provided this copyright notice appears in all copies. 
+			This document is provided &quot;as is&quot; without express or implied 
+			warranty, and with no claim as to its suitability for any purpose.</p>
+	</body>
 </html>
--- a/value_init.htm
+++ b/value_init.htm
@ -0,0 +1,219 @@
+<html>
+<head>
+             
+  <meta http-equiv="Content-Type"
+ content="text/html; charset=iso-8859-1">
+  <title>value_initialized</title>
+    
+</head>
+  <body vlink="#800080" link="#0000ff" text="#000000" bgcolor="#ffffff">
+                   
+<h2><img src="../../c++boost.gif" width="276" height="86">
+         Header &lt;<a href="../../boost/utility/value_init.hpp">boost/utility/value_init.hpp</a>&gt;
+     </h2>
+                   
+<h2>Contents</h2>
+                   
+<dl>
+  <dt><a href="#intro">Rationale</a></dt>
+  <dt><a href="#rationale">Introduction</a></dt>
+</dl>
+                   
+<ul>
+          <li><a href="#valueinit">value-initialization</a></li>
+          <li><a href="#valueinitsyn">value-initialization syntax</a></li>
+                   
+</ul>
+                   
+<dl class="page-index">
+  <dt><a href="#types">Types</a></dt>
+</dl>
+                   
+<ul>
+          <li><a href="#val_init"><code>value_initialized&lt;&gt;</code></a></li>
+                   
+</ul>
+              <a href="#acknowledgements">Acknowledgements</a><br>
+     <br>
+         
+<hr>          
+<h2><a name="rationale"></a>Rationale</h2>
+                  
+<p>Constructing and initializing objects in a generic way is difficult in
+    C++. The problem is that there are several different rules that apply
+for    initialization. Depending on the type, the value of a newly constructed
+  object  can be zero-initialized (logically 0), default-constructed (using
+  the default constructor), or indeterminate. When writing generic code,
+this   problem must be addressed. <code>value_initialized</code> provides
+a solution   with consistent syntax for value   initialization of scalar,
+union and class   types. <br>
+  </p>
+        
+<h2><a name="into"></a>Introduction</h2>
+     
+<p>The C++ standard [<a href="#references">1</a>] contains the definitions 
+    of <code>zero-initialization</code> and <code>default-initialization</code>.
+     Informally, zero-initialization means that the object is given the initial
+     value 0 (converted to the type) and default-initialization means that
+ POD   [<a href="#references">2</a>] types are zero-initialized, while class
+ types   are initialized with their corresponding default constructors. A
+<i>declaration</i>   can contain an <i>initializer</i>, which specifies the
+object's initial value.  The initializer can be just '()', which states that
+the object shall be default-initialized  (but see below). However, if a <i>declaration</i> 
+  has no <i>initializer</i>  and it is of a non-<code>const</code>, non-<code>static</code> 
+   POD type, the initial value is indeterminate:<cite>(see &sect;8.5 for the
+   accurate definitions).</cite></p>
+                   
+<pre>int x ; // no initializer. x value is indeterminate.<br>std::string s ; // no initializer, s is default-constructed.<br><br>int y = int() ; <br>// y is initialized using copy-initialization<br>// but the temporary uses an empty set of parentheses as the initializer,<br>// so it is default-constructed.<br>// A default constructed POD type is zero-initialized,<br>// therefore, y == 0.<br><br>void foo ( std::string ) ;<br>foo ( std::string() ) ; <br>// the temporary string is default constructed <br>// as indicated by the initializer ()  </pre>
+                    
+<h3><a name="valueinit">value-initialization</a></h3>
+                   
+<p>The first <a
+ href="http://anubis.dkuug.dk/JTC1/SC22/WG21/docs/cwg_defects.html">Technical 
+  Corrigendum for the C++ Standard</a> (TC1), whose draft   was released to
+  the public in November 2001, introduced <a
+ href="http://anubis.dkuug.dk/JTC1/SC22/WG21/docs/cwg_defects.html#178">Core 
+  Issue 178</a> (among   many other issues, of course).</p>
+                   
+<p> That issue introduced the new concept of <code>value-initialization</code>
+     (it also fixed the wording for zero-initialization). Informally, value-initialization 
+    is similar to default-initialization with the exception that in some cases
+    non-static data members and base class sub-objects are also value-initialized. 
+    The difference is that an object that is value-initialized won't have 
+(or    at least is less likely to have) indeterminate values for data members 
+ and   base class sub-objects; unlike the case of an object default constructed. 
+    (see Core Issue 178 for a normative description).</p>
+                   
+<p>In order to specify value-initialization of an object we need to use the
+     empty-set initializer: (). </p>
+                   
+<p><i>(but recall that the current C++ Standard states that '()' invokes default-initialization,
+not value-initialization)</i></p>
+                   
+<p>As before, a declaration with no intializer specifies default-initialization, 
+    and a declaration with a non-empty initializer specifies copy (=xxx) or
+  direct  (xxx) initialization. </p>
+                   
+<pre>template&lt;class T&gt; void eat(T);<br>int x ; // indeterminate initial value.<br>std::string s; // default-initialized.<br>eat ( int() ) ; // value-initialized<br>eat ( std::string() ) ; // value-initialied</pre>
+                    
+<h4><a name="valueinitsyn">value-initialization</a> syntax</h4>
+                   
+<p>Value initialization is specified using (). However, the empty set of
+parentheses is not permitted by the syntax of initializers because it is
+parsed as the declaration of a function taking no arguments: </p>
+                   
+<pre>int x() ; // declares function int(*)()<br>int y ( int() ) ; // decalares function int(*)( int(*)() )</pre>
+                    
+<p>Thus, the empty () must be put in some other initialization context.</p>
+                   
+<p>One alternative is to use copy-initialization syntax:</p>
+                   
+<pre>int x = int() ;</pre>
+                    
+<p>This works perfectly fine for POD types. But for non-POD class types,
+copy-initialization searches for a suitable constructor, which could be,
+for instance, the copy-constructor (it also searches for a suitable conversion
+sequence but this doesn't apply in this context). For an arbitrary unknown
+type, using this syntax may not have the value-initialization effect intended
+because we don't know if a copy from a default constructed object is exactly
+the same as a default constructed object, and the compiler is allowed (in
+some cases), but never required to, optimize the copy away.</p>
+                   
+<p>One possible generic solution is to use value-initialization of a non static
+data member:</p>
+                   
+<pre>template&lt;class T&gt; <br>struct W <br>{<br>  // value-initialization of 'data' here.<br>  W() : data() {}<br>  T data ;<br>} ;<br>W&lt;int&gt; w ;<br>// w.data is value-initialized for any type. </pre>
+                    
+<p><code>This is the solution supplied by the value_initialized&lt;&gt; template
+     class.</code></p>
+                   
+<h2><a name="types"></a>Types</h2>
+                   
+<h2><a name="val_init"><code>template class value_initialized&lt;T&gt;</code></a></h2>
+                   
+<pre>namespace boost {<br><br>template&lt;class T&gt;<br>class value_initialized<br>{<br>  public :<br>    value_initialized() : x() {}<br>    operator T&amp;() const { return x ; }<br>    T&amp; data() const { return x ; }<br><br>  private :<br>    <i>impll-defined</i> x ;<br>} ;<br><br>template&lt;class T&gt;<br>T const&amp; get ( value_initialized&lt;T&gt; const&amp; x )<br>{<br>  return x.data() ;<br>}<br><br>template&lt;class T&gt;<br>T&amp; get ( value_initialized&lt;T&gt;&amp; x )<br>{<br>  return x.data() ;<br>}<br><br>} // namespace boost<br></pre>
+                    
+<p>An object of this template class is a <code>T</code>-wrapper convertible 
+    to <code>'T&amp;'</code> whose wrapped object (data member of type <code>T</code>) 
+    is <a href="#valueinit">value-initialized</a> upon default-initialization 
+    of this wrapper class: </p>
+                   
+<pre>int zero = 0 ;<br>value_initialized&lt;int&gt; x ;<br>assert ( x == zero ) ;<br><br>std::string def ;<br>value_initialized&lt; std::string &gt; y ;<br>assert ( y == def ) ;<br></pre>
+                    
+<p>The purpose of this wrapper is to provide a consistent syntax for value
+     initialization of scalar, union and class types (POD and non-POD) since
+   the  correct syntax for value initialization varies (see <a
+ href="#valueinitsyn">value-initialization syntax</a>)</p>
+                   
+<p>The wrapped object can be accessed either through the conversion operator
+     <code>T&amp;</code>, the member function <code>data()</code>, or the
+non-member    function <code>get()</code>:  </p>
+                   
+<pre>void watch(int);<br>value_initialized&lt;int&gt; x;<br><br>watch(x) ; // operator T&amp; used.<br>watch(x.data());<br>watch( get(x) ) // function get() used</pre>
+                    
+<p>Both <code>const</code> and non-<code>const</code> objects can be wrapped. 
+    Mutable objects can be modified directly from within the wrapper but constant
+    objects cannot:</p>
+                   
+<pre>value_initialized&lt;int&gt; x ; <br>static_cast&lt;int&amp;&gt;(x) = 1 ; // OK<br>get(x) = 1 ; // OK<br><br>value_initialized&lt;int const&gt; y ; <br>static_cast&lt;int&amp;&gt;(y) = 1 ; // ERROR: cannot cast to int&amp;<br>static_cast&lt;int const&amp;&gt;(y) = 1 ; // ERROR: cannot modify a const value<br>get(y) = 1 ; // ERROR: cannot modify a const value</pre>
+                    
+<h3>Warning:</h3>
+                   
+<p>Both the conversion operator and the <code>data()</code> member function 
+    are <code>const</code> in order to allow access to the wrapped object 
+from    a constant wrapper:</p>
+                   
+<pre>void foo(int);<br>value_initialized&lt;int&gt; const x ;<br>foo(x);<br></pre>
+                    
+<p>But notice that this conversion operator is to <code>T&amp;</code> although 
+    it is itself <code>const</code>. As a consequence, if <code>T</code> is
+  a  non-<code>const</code> type, you can modify the wrapped object even from
+   within a constant wrapper:</p>
+                   
+<pre>value_initialized&lt;int&gt; const x_c ;<br>int&amp; xr = x_c ; // OK, conversion to int&amp; available even though x_c is itself const.<br>xr = 2 ; </pre>
+                    
+<p>The reason for this obscure behavior is that some commonly used compilers
+     just don't accept the following valid code:</p>
+                   
+<pre>struct X<br>{<br>  operator int&amp;() ;<br>  operator int const&amp;() const ;   <br>};<br>X x ;<br>(x == 1 ) ; // ERROR HERE!</pre>
+                    
+<p>These compilers complain about ambiguity between the conversion operators. 
+    This complaint is incorrect, but the only workaround that I know of is 
+ to   provide only one of them, which leads to the obscure behavior just explained.<br>
+          </p>
+                   
+<h3>Recommended practice: The non-member get() idiom</h3>
+                   
+<p>The obscure behavior of being able to modify a non-<code>const</code>
+wrapped object from within a constant wrapper can be avoided if access to
+the wrapped object is always performed with the <code>get()</code> idiom:</p>
+                   
+<pre>value_initialized&lt;int&gt; x ;<br>get(x) = 1 ; // OK<br><br>value_initialized&lt;int const&gt; cx ;<br>get(x) = 1 ; // ERROR: Cannot modify a const object<br><br>value_initialized&lt;int&gt; const x_c ;<br>get(x_c) = 1 ; // ERROR: Cannot modify a const object<br><br>value_initialized&lt;int const&gt; const cx_c ;<br>get(cx_c) = 1 ; // ERROR: Cannot modify a const object<br></pre>
+                    
+<h3><a name="references">References</a></h3>
+          [1] The C++ Standard, ISO/IEC 14882:98 <br>
+          [2] Plain Old Data           
+<h3><a name="acknowledgements"></a>Acknowledgements</h3>
+     value_initialized was developed by Fernando Cacciola, with help and
+suggestions from David Abrahams and Darin Adler.<br>
+Special thanks to Bj<42>rn Karlsson who carefully edited and completed this documentation.
+<pre>&nbsp;</pre>
+                    
+<hr>          
+<p>Revised 19 September 2002</p>
+                   
+<p>&copy; Copyright boost.org 2002. Permission to copy, use, modify, sell 
+and distribute this document is granted provided this copyright notice  appears 
+in all copies. This document is provided "as is" without express or implied 
+warranty, and with no claim as to its suitability for any purpose.</p>
+                   
+<p>Developed by <a href="mailto:fernando_cacciola@hotmail.com">Fernando Cacciola</a>,
+     the latest version of this file can be found at <a
+ href="http://www.boost.org">www.boost.org</a>, and the boost discussion list
+at <a href="http://www.yahoogroups.com/list/boost">www.yahoogroups.com/list/boost</a>.
+     </p>
+ <br>
+ <br>
+    
+</body>
+</html>
--- a/value_init_test.cpp
+++ b/value_init_test.cpp
@ -0,0 +1,119 @@
+// (C) 2002, Fernando Luis Cacciola Carballal.
+//
+// This material is provided "as is", with absolutely no warranty expressed
+// or implied. Any use is at your own risk.
+//
+// Permission to use or copy this software for any purpose is hereby granted
+// without fee, provided the above notices are retained on all copies.
+// Permission to modify the code and to distribute modified code is granted,
+// provided the above notices are retained, and a notice that the code was
+// modified is included with the above copyright notice.
+//
+// Test program for "boost/utility/value_init.hpp"
+//
+// Initial: 21 Agu 2002
+
+#include <iostream>
+#include <string>
+
+#include "boost/utility/value_init.hpp"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#define BOOST_INCLUDE_MAIN
+#include "boost/test/test_tools.hpp"
+
+//
+// Sample POD type
+//
+struct POD
+{
+  POD () : c(0), i(0), f(0) {}
+
+  POD ( char c_, int i_, float f_ ) : c(c_), i(i_), f(f_) {}
+
+  friend std::ostream& operator << ( std::ostream& os, POD const& pod )
+    { return os << '(' << pod.c << ',' << pod.i << ',' << pod.f << ')' ; }
+
+  friend bool operator == ( POD const& lhs, POD const& rhs )
+    { return lhs.f == rhs.f && lhs.c == rhs.c && lhs.i == rhs.i ; }
+
+  float f;
+  char  c;
+  int   i;
+} ;
+
+//
+// Sample non POD type
+//
+struct NonPODBase
+{
+  virtual ~NonPODBase() {}
+} ;
+struct NonPOD : NonPODBase
+{
+  NonPOD () : id() {}
+  NonPOD ( std::string const& id_) : id(id_) {}
+
+  friend std::ostream& operator << ( std::ostream& os, NonPOD const& npod )
+    { return os << '(' << npod.id << ')' ; }
+
+  friend bool operator == ( NonPOD const& lhs, NonPOD const& rhs )
+    { return lhs.id == rhs.id ; }
+
+  std::string id ;
+} ;
+
+template<class T>
+void test ( T const& y, T const& z )
+{
+  boost::value_initialized<T> x ;
+  BOOST_TEST ( y == x ) ;
+  BOOST_TEST ( y == get(x) ) ;
+  static_cast<T&>(x) = z ;
+  get(x) = z ;
+  BOOST_TEST ( x == z ) ;
+
+  boost::value_initialized<T> const x_c ;
+  BOOST_TEST ( y == x_c ) ;
+  BOOST_TEST ( y == get(x_c) ) ;
+  static_cast<T&>(x_c) = z ;
+  BOOST_TEST ( x_c == z ) ;
+  #ifdef PRODUCE_ERROR_1
+  get(x_c) = z ; // this should produce an ERROR
+  #endif
+
+  boost::value_initialized<T const> cx ;
+  BOOST_TEST ( y == cx ) ;
+  BOOST_TEST ( y == get(cx) ) ;
+  #ifdef PRODUCE_ERROR_2
+  get(cx) = z ; // this should produce an ERROR
+  #endif
+
+  boost::value_initialized<T const> const cx_c ;
+  BOOST_TEST ( y == cx_c ) ;
+  BOOST_TEST ( y == get(cx_c) ) ;
+  #ifdef PRODUCE_ERROR_3
+  get(cx_c) = z ; // this should produce an ERROR
+  #endif
+}
+
+int test_main(int, char **)
+{
+  test( 0,1234 ) ;
+  test( 0.0,12.34 ) ;
+  test( POD(0,0,0.0), POD('a',1234,56.78) ) ;
+  test( NonPOD( std::string() ), NonPOD( std::string("something") ) ) ;
+
+  return 0;
+}
+
+
+unsigned int expected_failures = 0;
+
+
+
+
+
Author	SHA1	Message	Date
nobody	2af1ebee76	This commit was manufactured by cvs2svn to create tag 'Version_1_31_0'. [SVN r22162]	2004-02-04 15:24:32 +00:00
John Maddock	eff257498c	Added missing include <cstddef> [SVN r21993]	2004-01-27 11:24:25 +00:00
John Maddock	ca866f21b2	When we have a compressed pair of two types that are the same, and both empty, then we must still have two distict objects in the pair. [SVN r21958]	2004-01-26 11:29:07 +00:00
Aleksey Gurtovoy	bd5abfb4d0	merged DM fixes from the main trunk [SVN r21934]	2004-01-26 00:30:09 +00:00
Fernando Cacciola	06e6a36cea	Merged fixes from trunk to branch [SVN r21741]	2004-01-14 20:43:53 +00:00
Dave Abrahams	0eb427cabe	merged from trunk [SVN r21530]	2004-01-07 14:08:10 +00:00
nobody	7d6f944d85	This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'. [SVN r21427]	2003-12-30 12:10:04 +00:00
Rene Rivera	806745f24e	Fix tabs in file. [SVN r21399]	2003-12-26 23:26:49 +00:00
Beman Dawes	4231f774e4	fix next_prior_test.cpp directory [SVN r21384]	2003-12-23 19:14:37 +00:00
Dave Abrahams	dfc320124f	Extended next/prior using patch from Daniel Walker (Daniel.Walker-at-bowneglobal.com) [SVN r21382]	2003-12-23 14:59:59 +00:00
Eric Friedman	be43ba1569	Improved workarounds. [SVN r21157]	2003-12-06 03:57:54 +00:00
Fernando Cacciola	f3f879555a	Fixed result_type [SVN r21155]	2003-12-05 22:03:33 +00:00
Jaakko Järvi	3155044abd	added dummy versions of enable_if templates for platforms that have BOOST_NO_SFINAE defined [SVN r21154]	2003-12-05 21:38:43 +00:00
Jaakko Järvi	484d184de5	guarded enable_if definitions with BOOST_NO_SFINAE [SVN r21149]	2003-12-05 16:31:38 +00:00
Fernando Cacciola	3305cf1592	Fixed a bug in the semantics of less_pointees() {again} [SVN r21133]	2003-12-04 01:53:29 +00:00
Fernando Cacciola	ec36cd8c54	Fixed a bug in the semantics of less_pointees() [SVN r21132]	2003-12-04 01:47:31 +00:00
Beman Dawes	61fb5a0b8f	fix broken link to logo [SVN r21122]	2003-12-03 14:36:38 +00:00
John Maddock	8024c3e9c7	Updated license terms [SVN r21120]	2003-12-03 13:34:11 +00:00
Daniel Frey	2f5945d0cd	Removed bool_testable, added note about portability of separate, explicit instantiation, changed license of documentation [SVN r21110]	2003-12-03 07:01:28 +00:00
Jaakko Järvi	929517d6d7	Added enable_if library [SVN r21090]	2003-12-02 21:41:15 +00:00
Peter Dimov	abcab174a5	_MSC_VER use clarified. [SVN r20992]	2003-11-28 15:35:21 +00:00
Fernando Cacciola	801be90699	Moved from "utility" to "detail" until a Fast Track Review formalizes it. [SVN r20983]	2003-11-28 14:36:21 +00:00
Dave Abrahams	265c2348b8	Removed access category tags from iterator library, made corresponding changes elsewhere. boost/iterator and libs/iterator/test were updated from branch "simplify" [SVN r20905]	2003-11-22 01:18:37 +00:00
Daryle Walker	fb95bcc64c	Moved some of my stuff to the Boost Software License, Version 1.0 [SVN r20681]	2003-11-05 07:04:53 +00:00
Fernando Cacciola	aedc410525	New License [SVN r20607]	2003-11-03 02:59:08 +00:00
Fernando Cacciola	7fa440c154	* empty log message * [SVN r20511]	2003-10-28 00:09:18 +00:00
John Maddock	746e0fad2b	Changed email address to john@johnmaddock.co.uk [SVN r20472]	2003-10-24 11:13:42 +00:00
Dave Abrahams	1616f6f5a8	Update credits for R. Samuel Klatchko [SVN r20325]	2003-10-09 14:16:15 +00:00
Vladimir Prus	ca3e7d8530	Add V2 Jamfile [SVN r20270]	2003-10-07 07:25:24 +00:00
Fernando Cacciola	f0f753ba6c	Typed in place construction added [SVN r20070]	2003-09-15 20:28:10 +00:00
Beman Dawes	532065b51b	Change license message to reference Boost Software License [SVN r20038]	2003-09-12 17:09:29 +00:00
Fernando Cacciola	4bfb534bae	Added for new Boost.Optional functionality [SVN r19995]	2003-09-10 15:40:47 +00:00
Dave Abrahams	95ba7a4381	Use the import rule [SVN r19968]	2003-09-08 17:38:49 +00:00
Aleksey Gurtovoy	e92213431e	Removed tie_example.cpp per Daniel's request [SVN r19910]	2003-09-03 05:24:48 +00:00
Daniel Frey	7dd7daee1b	Removed obsolete references to utility/tie [SVN r19902]	2003-09-01 21:04:26 +00:00
Dave Abrahams	953cc46220	Removed code-breaking change from boost/detail/iterator.hpp and corresponding workarounds from tests. Added permutation_iterator_test to the suite after fixing it up -- it was riddled with bugs! [SVN r19841]	2003-08-28 20:18:51 +00:00
Dave Abrahams	b5ae0ad86b	Moved to much cleaner system of using BOOST_TT_BROKEN_COMPILER_SPEC for handling vc6/7 deficiencies with iterator_traits. Fixed a bug in iterator_facade which was causing incomplete types to be passed through is_convertible. Reinstated libs/utility/iterator_traits_test.cpp [SVN r19840]	2003-08-28 16:52:02 +00:00
Daniel Frey	c86fcbf456	Fix for Metrowerks CW [SVN r19626]	2003-08-16 01:05:43 +00:00
Ronald Garcia	6ded8b9ad6	Initial revision. [SVN r19536]	2003-08-11 19:24:03 +00:00
Ronald Garcia	bb6a6272e1	Updated shared_container_iterator to use the new iterator adaptors library. Updated the documentation and examples as well to reflect the changes. [SVN r19535]	2003-08-11 16:29:47 +00:00
Daniel Frey	242634b3fc	Added safe_bool_testable_test [SVN r19373]	2003-07-30 21:33:37 +00:00
Daniel Frey	662cf14bf6	Initial version [SVN r19372]	2003-07-30 21:32:19 +00:00
Dave Abrahams	fe3aaf62cd	Undo overeager workarounding and safe_bool. [SVN r19364]	2003-07-30 12:41:10 +00:00
Dave Abrahams	cb189bd6be	operators.hpp, operators_test.cpp - workaround for compilers not supporting the PP lib, many workarounds for another problem which may be our bug. linear_congruential.hpp - Borland workaround [SVN r19350]	2003-07-30 01:11:14 +00:00
Dave Abrahams	f57c914b8f	Preparation for delivering nicely-formatted error messages in Boost.Python. The major change is that, instead of being boost::function2<PyObject,PyObject,PyObject>, py_function is now a runtime-polymorphic wrapper for compile-time polymorphic behavior (just like function) of our own which carries more information/behaviors. In particular, you can retrieve an array of c-strings describing the types in the function signature. Additionally, the minimum and maximum arity are stored in the py_function object instead of in the 'function' object which wraps it. data_members.hpp - Adjustments for the new py_function. Workarounds for CodeWarrior Pro 8.3 bugs in function template argument deduction with pointers-to-members. * has_back_reference.hpp, test/back_reference.cpp, test/select_holder.cpp - Updated to follow the metafunction protocol * init.hpp, detail/defaults_gen.hpp - Make Keywords a more-specific type in function signatures to prevent string literals that show up as char[N] from binding to the wrong argument (at least Intel 7.1 for Windows does this). * make_function.hpp - Adjustments for the new py_function. Arities are now computed by caller<>. * opaque_pointer_converter.hpp, type_id.hpp - Use BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS facilities; generate specializations that all compilers can handle. * raw_function.hpp - Adjustments for the new py_function. * caller.hpp - Added arity and signature type name reporting. * detail/config.hpp Enable __declspec(dllexport) for Cygwin, thereby fixing the recent horrible Cygwin linking problems. * detail/msvc_typeinfo.hpp - Always pass boost::type<T>* explicitly, thereby working around incompatible notions of how to specialize function templates with default arguments on various compilers. * object/function.hpp , object/function_handle.hpp , object/function_object.hpp , object/function_object.cpp Adjustments for the new py_function. Arities are carried by py_function. * object/iterator.hpp, object/iterator.cpp Adjustments for the new py_function; we have to compute a signature of types to construct it with. * object/py_function.hpp Removed dependency on boost::function; see the comment at the top of this entry for more details. * object/select_holder.hpp Clean up to more closely follow MPL idioms. * test/Jamfile - Adjust the embedding test for the new Cygwin use of declspec. Update bases and pointee tests with missing properties. * test/input_iterator.cpp - Updates for the new iterator adaptors. * test/opaque.py - Add Python encoding comment to suppress PendinDeprecationWarning with recent Python builds. * test/str.cpp Pass a Python long instead of a float to string.expandtabs, suppressing a PendinDeprecationWarning with recent Python builds. * libs/utility/counting_iterator_example.cpp Borland workaround * libs/utility/indirect_iterator_example.cpp const-correctness fix. * [SVN r19247]	2003-07-22 00:06:41 +00:00
Thomas Witt	7cec198e14	Added missing algorithm include. [SVN r19230]	2003-07-20 19:17:18 +00:00
Dave Abrahams	52d3120528	Borland workaround [SVN r19157]	2003-07-16 19:10:34 +00:00
Dave Abrahams	f1aff5670c	strict 2-phase ADL fixes. [SVN r19152]	2003-07-16 15:16:21 +00:00
Dave Abrahams	632f682292	Satisfy assignable requirement for output iterators. [SVN r19150]	2003-07-16 14:30:47 +00:00
Peter Dimov	d1d0d6b788	Fixed Intel 7 issue (reported by Daniel Frey) [SVN r19145]	2003-07-16 10:53:06 +00:00
Jens Maurer	3bd833c8ff	avoid default parameters for function templates, they confuse SunCC [SVN r19100]	2003-07-13 18:59:08 +00:00
Jens Maurer	1ef77b0853	fix cut-and-paste problem with subproject path [SVN r19084]	2003-07-12 09:37:36 +00:00
Dave Abrahams	074007ab8c	Get examples working, mostly. Some interface expansion for a few of the adaptors, allowing default construction of UnaryFunction and Predicate arguments when they are class types. [SVN r19081]	2003-07-12 04:15:13 +00:00
Dave Abrahams	c4b7aaf281	Move to new iterator adaptors [SVN r19074]	2003-07-11 22:18:58 +00:00
Dave Abrahams	22b8494e9a	Factored out separate utility/test Jamfile [SVN r19068]	2003-07-11 17:24:18 +00:00
Daryle Walker	c1c8329403	Expanded base-from-member constructors to 10 arguments; did minor tweaks [SVN r18791]	2003-06-15 01:16:49 +00:00
Peter Dimov	20a89040e1	-Wundef fixes. [SVN r18788]	2003-06-12 17:09:24 +00:00
Peter Dimov	1c7a2a1476	IBM C++ support added. [SVN r18587]	2003-05-28 13:45:58 +00:00
Daniel Frey	7c40cc0b63	Fixed bool_testable for compilers with BOOST_NO_OPERATORS_IN_NAMESPACE [SVN r18521]	2003-05-23 23:09:21 +00:00
Peter Dimov	73a9e0d351	Intel support. [SVN r18520]	2003-05-23 22:30:23 +00:00
Daniel Frey	dc9856744a	Fixed tests for bool_testable [SVN r18502]	2003-05-23 00:18:57 +00:00
Daniel Frey	88f4e47550	Added bool_testable by Sam Partington [SVN r18413]	2003-05-15 22:40:33 +00:00
Dave Abrahams	1be04eeec5	Fix a bug in preprocessor usage [SVN r18231]	2003-04-11 06:56:52 +00:00
Daniel Frey	56acf9c325	Fixed shift-operators to respect BOOST_FORCE_SYMMETRIC_OPERATORS [SVN r17664]	2003-02-26 21:26:57 +00:00
Aleksey Gurtovoy	c6e3957efc	MPL names/directory structure refactoring [SVN r17651]	2003-02-25 23:11:41 +00:00
Peter Dimov	25e8284950	Qualified checked_delete calls to prevent ADL (reported by Daniel Frey) [SVN r17636]	2003-02-25 13:00:22 +00:00
Dave Abrahams	37a6537a5b	fix metafunctions for MPL [SVN r17621]	2003-02-25 00:57:33 +00:00
Aleksey Gurtovoy	80df1d8f12	split utility.hpp header [SVN r17472]	2003-02-17 06:20:57 +00:00
Peter Dimov	75afed7f17	Made operator()s const. [SVN r17411]	2003-02-14 16:20:01 +00:00
Peter Dimov	1d7066aee1	__func__ is a predefined identifier, not a macro. [SVN r17308]	2003-02-10 16:25:41 +00:00
Fernando Cacciola	12272a38d4	Initial Commit (was left out when the Optional Library was commited) [SVN r17204]	2003-02-04 15:29:12 +00:00
Jeremy Siek	04f901e52e	fixed some typos [SVN r17052]	2003-01-27 19:14:18 +00:00
Beman Dawes	fabfb31bf6	add value_init [SVN r16826]	2003-01-09 13:26:13 +00:00
Beman Dawes	683701cd07	fix invalid bookmarks [SVN r16823]	2003-01-09 13:03:37 +00:00
Dave Abrahams	119c64be0b	Workaround VC7 bug which strips const from nested classes [SVN r16797]	2003-01-08 17:21:10 +00:00
Beman Dawes	d429c9a7d8	minor cleanup [SVN r16709]	2002-12-27 16:58:27 +00:00
Beman Dawes	1e8216431b	add or update See www.boost.org comments [SVN r16708]	2002-12-27 16:51:53 +00:00
Peter Dimov	e45b2e2136	Doc link updated. [SVN r16699]	2002-12-24 12:34:42 +00:00
Beman Dawes	9e6951009b	Add /libs/lib-name to comment [SVN r16685]	2002-12-23 02:43:12 +00:00
Dave Abrahams	a009a209f1	Use BOOST_WORKAROUND [SVN r16668]	2002-12-20 00:03:04 +00:00
Peter Dimov	97605056ed	Added a note that throw_exception must not return (Beman Dawes) [SVN r16471]	2002-12-02 12:12:42 +00:00
Peter Dimov	8fcfa33d33	Fix: Comeau with bcc32 as backend defines __BORLANDC__ as 1. [SVN r16455]	2002-11-28 13:32:44 +00:00
Toon Knapen	aa65e3da3b	sort_by_value(std::list<std::string>& l) is not declared inline anymore to make it compile with vacpp [SVN r16407]	2002-11-25 15:54:37 +00:00
Peter Dimov	b4cfadb4d5	Metrowerks support (Bertolt Mildner) [SVN r16263]	2002-11-15 19:44:18 +00:00
Peter Dimov	45a6249668	New BOOST_ASSERT, including documentation. [SVN r16240]	2002-11-14 16:09:29 +00:00
Peter Dimov	1d601aef4d	boost::throw_exception documentation added. [SVN r16239]	2002-11-14 15:13:59 +00:00
Peter Dimov	32fb45eba9	checked_delete.hpp documentation added. [SVN r16238]	2002-11-14 14:53:32 +00:00
Peter Dimov	2b7d10aceb	BOOST_CURRENT_FUNCTION documentation added. [SVN r16236]	2002-11-14 14:41:25 +00:00
Dave Abrahams	5dc62711e1	Fix from Yitzhak Sapir <yitzhaks@actimize.com> [SVN r16198]	2002-11-11 19:50:05 +00:00
Dave Abrahams	252c02aca0	Works with MSVC and Intel5 now. Thanks, Aleksey!! [SVN r16165]	2002-11-08 17:08:17 +00:00
Dave Abrahams	9655beb7ba	Cleanups on boost::iterator_traits<> Broke MSVC though :( [SVN r16157]	2002-11-08 06:57:31 +00:00
Dave Abrahams	f0ea53e77e	rip out illegal semicolons [SVN r16134]	2002-11-06 18:20:38 +00:00
Dave Abrahams	4755b42909	Daniel Frey's NRVO patches [SVN r16084]	2002-11-04 01:59:32 +00:00
Peter Dimov	ef9af03c6c	Changed typename to class; some libraries helpfully #define typename [SVN r15970]	2002-10-23 13:55:18 +00:00
Björn Karlsson	7439073cbf	Merged from branch to trunk [SVN r15572]	2002-09-30 16:54:26 +00:00
Ralf W. Grosse-Kunstleve	aff985a563	explicit "private" inheritance to avoid compiler warnings (MIPSpro) [SVN r15422]	2002-09-17 21:06:32 +00:00
Dave Abrahams	db425222d5	mpl_v2 branch checkin [SVN r15258]	2002-09-11 05:35:41 +00:00
Ronald Garcia	e20af510f7	Initial Revision [SVN r15254]	2002-09-10 16:13:08 +00:00
Ronald Garcia	d8230c6a73	Added Shared Container Iterator adaptor to iterator adaptor library. [SVN r15169]	2002-09-05 14:05:29 +00:00
Beman Dawes	f5690787bf	Distinguish between VC++ versions [SVN r15127]	2002-09-01 14:57:40 +00:00
John Maddock	a4fd7b32dd	Misc Kylix fixes [SVN r15086]	2002-08-25 11:57:37 +00:00
Ronald Garcia	f4336ec693	fixed typo. [SVN r14798]	2002-08-12 20:47:54 +00:00
Beman Dawes	03d906976b	Reduced probes from 10,000 to 1,000 to speed regression tests [SVN r14789]	2002-08-12 15:05:23 +00:00
Beman Dawes	4ba6a96822	fix test_main signature [SVN r14783]	2002-08-12 13:22:40 +00:00
John Maddock	1ea4140d56	Added tests for BOOST_NO_STD_ITERATOR_TRAITS [SVN r14654]	2002-07-31 11:25:25 +00:00
Douglas Gregor	351d4ecb15	Document policies() member of iterator_adaptor [SVN r14613]	2002-07-26 00:03:24 +00:00
Beman Dawes	7fbf84dcc6	BaseType -> Base in one more place [SVN r14605]	2002-07-25 19:10:05 +00:00
Dave Abrahams	3ff49b272d	fixup [SVN r14598]	2002-07-25 14:16:54 +00:00
Dave Abrahams	5b52e3d418	Fix doc based on Beman's feedback [SVN r14596]	2002-07-25 13:52:48 +00:00
Dave Abrahams	8c0eb498d3	Fix unversioned VC++ checks [SVN r14436]	2002-07-13 12:26:19 +00:00
Dave Abrahams	48a81ef7ea	VC++ fixes [SVN r14435]	2002-07-13 12:22:51 +00:00
Dave Abrahams	f7610c9b26	fix link [SVN r14318]	2002-07-05 23:51:20 +00:00
Dave Abrahams	1755eaf019	Merged from RC_1_28_0 [SVN r13944]	2002-05-16 00:56:42 +00:00
John Maddock	6b8b218efb	Removed tabs, fixed end of files. [SVN r13803]	2002-05-10 11:35:38 +00:00
Beman Dawes	333d79b345	Add index.html so automatic tools work correctly [SVN r13725]	2002-05-07 19:23:05 +00:00
John Maddock	f0fa436fe4	Added new config macro BOOST_HAS_MS_INT64 to detect presence of __int64 data type. Modified boost source to use BOOST_HAS_LONG_LONG and BOOST_HAS_MS_INT64 where appropriate to do so. [SVN r13714]	2002-05-07 11:24:29 +00:00
John Maddock	13e6d78fa8	Fixes for Borland C++ Builder 6 [SVN r13662]	2002-05-04 11:03:42 +00:00
John Maddock	7126ea2685	Borland C++ Builder 6 fixes [SVN r13659]	2002-05-04 10:55:15 +00:00
John Maddock	a37518cb4a	Fixed broken links. [SVN r13574]	2002-04-27 11:05:49 +00:00
Jens Maurer	64b3e8c3bd	add missing #include <iterator> [SVN r13554]	2002-04-23 19:52:11 +00:00
Peter Dimov	339937380e	MSVC fixes. [SVN r13476]	2002-04-13 13:19:57 +00:00
Dave Abrahams	6156f0d302	Roll addressof() patch back in! [SVN r13433]	2002-04-10 17:01:35 +00:00
Douglas Gregor	00560e8e17	addressof.hpp: - Peter Dimov suggested a fix to deal with those evil cv-qualifiers [SVN r13431]	2002-04-10 14:47:32 +00:00
Dave Abrahams	029ff9828f	Roll back addressof() patch temporarily [SVN r13428]	2002-04-10 09:48:30 +00:00
Douglas Gregor	ec188c7c3e	Make local classes nonlocal to silence annoying warnings from Borland C++ [SVN r13418]	2002-04-10 04:00:22 +00:00
Douglas Gregor	0a0296a5d0	ref.hpp: - Use addressof() instead of & operator [SVN r13416]	2002-04-10 03:36:17 +00:00
Douglas Gregor	6e26a5bbe7	boost/utility.hpp: - Include boost/utility/addressof.hpp boost/utility/addressof.hpp: - addressof() implementation libs/utility/utility.htm: - Document addressof libs/utility/addressof_test.cpp: - Test addressof() [SVN r13414]	2002-04-10 03:31:18 +00:00
Douglas Gregor	dc1b6246a0	boost/ref.hpp: - Added get_pointer method to return a pointer (instead of a reference) libs/bind/ref.html: - Document get_pointer [SVN r13322]	2002-03-31 00:24:00 +00:00