Created a branch from trunk

[SVN r38959]
2007-08-26 05:34:35 +00:00
11 changed files with 291 additions and 480 deletions
--- a/doc/design_decisions_rationale.html
+++ b/doc/design_decisions_rationale.html
@ -1,4 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>

 <title>Design decisions rationale for Boost Tuple Library</title>
@ -21,8 +20,8 @@ Tuples were originally under a subnamespace.
 As a result of the discussion, tuple definitions were moved directly under the <code>boost</code> namespace.
 As a result of a continued discussion, the subnamespace was reintroduced.
 The final (I truly hope so) solution is now to have all definitions in namespace <code>::boost::tuples</code>, and the most common names in the <code>::boost</code> namespace as well. 
-This is accomplished with using declarations (suggested by Dave Abrahams):</p>
-<pre><code>namespace boost {
+This is accomplished with using declarations (suggested by Dave Abrahams):
+<code><pre>namespace boost {
  namespace tuples {
      ...      
    // All library code
@ -33,8 +32,8 @@ This is accomplished with using declarations (suggested by Dave Abrahams):</p>
  using tuples::tie;
  using tuples::get;
 }
-</code></pre>
-<p>With this arrangement, tuple creation with direct constructor calls, <code>make_tuple</code> or <code>tie</code> functions do not need the namespace qualifier.
+</pre></code>
+With this arrangement, tuple creation with direct constructor calls, <code>make_tuple</code> or <code>tie</code> functions do not need the namespace qualifier.
 Further, all functions that manipulate tuples are found with Koenig-lookup.
 The only exceptions are the <code>get&lt;N&gt;</code> functions, which are always called with an explicitly qualified template argument, and thus Koenig-lookup does not apply.
 Therefore, get is lifted to <code>::boost</code> namespace with a using declaration.
@ -55,9 +54,9 @@ The rationale for not using the most natural name 'tuple' is to avoid having an
 Namespace names are, however, not generally in plural form in boost libraries. 
 First, no real trouble was reported for using the same name for a namespace and a class and we considered changing the name 'tuples' to 'tuple'.
 But we found some trouble after all.
-Both gcc and edg compilers reject using declarations where the namespace and class names are identical:</p>
+Both gcc and edg compilers reject using declarations where the namespace and class names are identical:

-<pre><code>namespace boost {
+<code><pre>namespace boost {
  namespace tuple {
    ... tie(...);
    class tuple; 
@ -67,13 +66,13 @@ Both gcc and edg compilers reject using declarations where the namespace and cla
  using tuple::tuple; // error
    ...
 }
-</code></pre>
+</pre></code>

-<p>Note, however, that a corresponding using declaration in the global namespace seems to be ok:</p>
+Note, however, that a corresponding using declaration in the global namespace seems to be ok: 

-<pre><code>
+<code><pre>
 using boost::tuple::tuple; // ok;
-</code></pre>
+</pre></code>


 <h2>The end mark of the cons list (nil, null_type, ...)</h2>
@ -81,15 +80,14 @@ using boost::tuple::tuple; // ok;
 <p>
 Tuples are internally represented as <code>cons</code> lists:

-<pre><code>tuple&lt;int, int&gt;
-</code></pre> 
-<p>inherits from</p>
-<pre><code>cons&lt;int, cons&lt;int, null_type&gt; &gt;
+<code><pre>tuple&lt;int, int&gt;
+</pre></code> 
+inherits from 
+<code><pre>cons&lt;int, cons&lt;int, null_type&gt; &gt;
 </code></pre>

-<p>
 <code>null_type</code> is the end mark of the list. Original proposition was <code>nil</code>, but the name is used in MacOS, and might have caused problems, so <code>null_type</code> was chosen instead.
-Other names considered were <i>null_t</i> and <i>unit</i> (the empty tuple type in SML).</p>
+Other names considered were <i>null_t</i> and <i>unit</i> (the empty tuple type in SML).
 <p>
 Note that <code>null_type</code> is the internal representation of an empty tuple: <code>tuple&lt;&gt;</code> inherits from <code>null_type</code>.
 </p>
@ -97,22 +95,22 @@ Note that <code>null_type</code> is the internal representation of an empty tupl
 <h2>Element indexing</h2>

 <p>
-Whether to use 0- or 1-based indexing was discussed more than thoroughly, and the following observations were made:</p>
+Whether to use 0- or 1-based indexing was discussed more than thoroughly, and the following observations were made:

 <ul>
 <li> 0-based indexing is 'the C++ way' and used with arrays etc.</li>
 <li> 1-based 'name like' indexing exists as well, eg. <code>bind1st</code>, <code>bind2nd</code>, <code>pair::first</code>, etc.</li>
 </ul>
-<p>Tuple access with the syntax <code>get&lt;N&gt;(a)</code>, or <code>a.get&lt;N&gt;()</code> (where <code>a</code> is a tuple and <code>N</code> an index), was considered to be of the first category, hence, the index of the first element in a tuple is 0.</p>
+Tuple access with the syntax <code>get&lt;N&gt;(a)</code>, or <code>a.get&lt;N&gt;()</code> (where <code>a</code> is a tuple and <code>N</code> an index), was considered to be of the first category, hence, the index of the first element in a tuple is 0.

 <p>
 A suggestion to provide 1-based 'name like' indexing with constants like <code>_1st</code>, <code>_2nd</code>, <code>_3rd</code>, ... was made.
 By suitably chosen constant types, this would allow alternative syntaxes:

-<pre><code>a.get&lt;0&gt;() == a.get(_1st) == a[_1st] == a(_1st);
-</code></pre>
+<code><pre>a.get&lt;0&gt;() == a.get(_1st) == a[_1st] == a(_1st);
+</pre></code>

-<p>We chose not to provide more than one indexing method for the following reasons:</p>
+We chose not to provide more than one indexing method for the following reasons:
 <ul>
 <li>0-based indexing might not please everyone, but once its fixed, it is less confusing than having two different methods (would anyone want such constants for arrays?).</li>
 <li>Adding the other indexing scheme doesn't really provide anything new (like a new feature) to the user of the library.</li>
@ -127,18 +125,18 @@ Such constants are easy to add.

 <h2>Tuple comparison</h2>

-<p>The comparison operator implements lexicographical order. 
-Other orderings were considered, mainly dominance (<i>a &lt; b iff for each i a(i) &lt; b(i)</i>). 
-Our belief is, that lexicographical ordering, though not mathematically the most natural one, is the most frequently needed ordering in everyday programming.</p>
+The comparison operator implements lexicographical order. 
+Other orderings were considered, mainly dominance (<i>a &lt; b iff for each i a(i) < b(i)</i>). 
+Our belief is, that lexicographical ordering, though not mathematically the most natural one, is the most frequently needed ordering in everyday programming.

 <h2>Streaming</h2>

 <p>
 The characters specified with tuple stream manipulators are stored within the space allocated by <code>ios_base::xalloc</code>, which allocates storage for <code>long</code> type objects.
 <code>static_cast</code> is used in casting between <code>long</code> and the stream's character type. 
-Streams that have character types not convertible back and forth to long thus fail to compile.</p>
+Streams that have character types not convertible back and forth to long thus fail to compile.

-<p>This may be revisited at some point. The two possible solutions are:</p>
+This may be revisited at some point. The two possible solutions are:
 <ul>
 <li>Allow only plain <code>char</code> types as the tuple delimiters and use <code>widen</code> and <code>narrow</code> to convert between the real character type of the stream. 
 This would always compile, but some calls to set manipulators might result in a different
--- a/doc/tuple_advanced_interface.html
+++ b/doc/tuple_advanced_interface.html
@ -2,52 +2,53 @@
 <html>
  <head>
    <title>Tuple library advanced features</title>
-  </head>
-
 <body bgcolor="#FFFFFF" text="#000000">

 <IMG SRC="../../../boost.png" 
     ALT="C++ Boost" width="277" height="86">

+  </head>
+
+  <body>
    <h1>Tuple library advanced features</h1>

 The advanced features described in this document are all under namespace <code>::boost::tuples</code>

 <h2>Metafunctions for tuple types</h2>
 <p>
-Suppose <code>T</code> is a tuple type, and <code>N</code> is a constant integral expression.</p>
+Suppose <code>T</code> is a tuple type, and <code>N</code> is a constant integral expression. 

-<pre><code>element&lt;N, T&gt;::type</code></pre>
+<code><pre>element&lt;N, T&gt;::type</pre></code>

-<p>gives the type of the <code>N</code>th element in the tuple type <code>T</code>. If <code>T</code> is const, the resulting type is const qualified as well. 
+gives the type of the <code>N</code>th element in the tuple type <code>T</code>. If <code>T</code> is const, the resulting type is const qualified as well. 
 Note that the constness of <code>T</code> does not affect reference type
 elements.
 </p>

-<pre><code>length&lt;T&gt;::value</code></pre>
+<code><pre>length&lt;T&gt;::value</pre></code>

-<p>gives the length of the tuple type <code>T</code>.
+gives the length of the tuple type <code>T</code>.
 </p>

 <h2>Cons lists</h2>

 <p>
 Tuples are internally represented as <i>cons lists</i>.
-For example, the tuple </p>
+For example, the tuple 

-<pre><code>tuple&lt;A, B, C, D&gt;</code></pre>
+<code><pre>tuple&lt;A, B, C, D&gt;</pre></code>

-<p>inherits from the type</p>
-<pre><code>cons&lt;A, cons&lt;B, cons&lt;C, cons&lt;D, null_type&gt; &gt; &gt; &gt;
-</code></pre>
+ inherits from the type
+<code><pre>cons&lt;A, cons&lt;B, cons&lt;C, cons&lt;D, null_type&gt; &gt; &gt; &gt;
+</pre></code>

-<p>The tuple template provides the typedef <code>inherited</code> to access the cons list representation. E.g.:
+The tuple template provides the typedef <code>inherited</code> to access the cons list representation. E.g.:
 <code>tuple&lt;A&gt;::inherited</code> is the type <code>cons&lt;A, null_type&gt;</code>.
 </p>

 <h4>Empty tuple</h4>
 <p>
-The internal representation of the empty tuple <code>tuple&lt;&gt;</code> is <code>null_type</code>.
+The internal representation of the empty tuple <code>tuple&lt;&gt</code> is <code>null_type</code>.
 </p>

 <h4>Head and tail</h4>
@ -83,11 +84,11 @@ inline void set_to_zero(cons&lt;H, T&gt;&amp; x) { x.get_head() = 0; set_to_zero
 A cons list can be default constructed provided that all its elements can be default constructed.
 </p>
 <p>
-A cons list can be constructed from its head and tail. The prototype of the constructor is:</p>
+A cons list can be constructed from its head and tail. The prototype of the constructor is:
 <pre><code>cons(typename access_traits&lt;head_type&gt;::parameter_type h,
     const tail_type&amp; t)
 </code></pre>
-<p>The traits template for the head parameter selects correct parameter types for different kinds of element types (for reference elements the parameter type equals the element type, for non-reference types the parameter type is a reference to const non-volatile element type).
+The traits template for the head parameter selects correct parameter types for different kinds of element types (for reference elements the parameter type equals the element type, for non-reference types the parameter type is a reference to const non-volatile element type).
 </p>
 <p>
 For a one-element cons list the tail argument (<code>null_type</code>) can be omitted.
@ -98,16 +99,16 @@ For a one-element cons list the tail argument (<code>null_type</code>) can be om

 <h4><code>access_traits</code></h4>
 <p>
-The template <code>access_traits</code> defines three type functions. Let <code>T</code> be a type of an element in a tuple:</p>
+The template <code>access_traits</code> defines three type functions. Let <code>T</code> be a type of an element in a tuple:
 <ol>
-<li><code>access_traits&lt;T&gt;::non_const_type</code> maps <code>T</code> to the return type of the non-const access functions (nonmember and member <code>get</code> functions, and the <code>get_head</code> function).</li>
+<li><code>access_traits&lt;T&gt;::non_const_type</code> maps <code>T</code> to the return type of the non-const access functions (nonmeber and member <code>get</code> functions, and the <code>get_head</code> function).</li>
 <li><code>access_traits&lt;T&gt;::const_type</code> maps <code>T</code> to the return type of the const access functions.</li>
 <li><code>access_traits&lt;T&gt;::parameter_type</code> maps <code>T</code> to the parameter type of the tuple constructor.</li>
 </ol>
 <h4><code>make_tuple_traits</code></h4>

-<p>The element types of the tuples that are created with the <code>make_tuple</code> functions are computed with the type function <code>make_tuple_traits</code>. 
-The type function call <code>make_tuple_traits&lt;T&gt;::type</code> implements the following type mapping:</p>
+The element types of the tuples that are created with the <code>make_tuple</code> functions are computed with the type function <code>make_tuple_traits</code>. 
+The type function call <code>make_tuple_traits&lt;T&gt;::type</code> implements the following type mapping:
 <ul>
 <li><i>any reference type</i> -&gt; <i>compile time error</i>
 </li>
@ -119,7 +120,7 @@ The type function call <code>make_tuple_traits&lt;T&gt;::type</code> implements
 </li>
 </ul>

-<p>Objects of type <code>reference_wrapper</code> are created with the <code>ref</code> and <code>cref</code> functions (see <A href="tuple_users_guide.html#make_tuple">The <code>make_tuple</code> function</A>.)
+Objects of type <code>reference_wrapper</code> are created with the <code>ref</code> and <code>cref</code> functions (see <A href="tuple_users_guide.html#make_tuple">The <code>make_tuple</code> function</A>.)
 </p>

 <p>Reference wrappers were originally part of the tuple library, but they are now a general utility of boost. 
--- a/doc/tuple_users_guide.html
+++ b/doc/tuple_users_guide.html
@ -1,4 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>The Boost Tuple Library</title>
@ -54,22 +53,20 @@ To compensate for this &quot;deficiency&quot;, the Boost Tuple Library implement

 <h2><a name="using_library">Using the library</a></h2>

-<p>To use the library, just include:</p>
+<p>To use the library, just include:

 <pre><code>#include &quot;boost/tuple/tuple.hpp&quot;</code></pre>

-<p>Comparison operators can be included with:</p>
+<p>Comparison operators can be included with:
 <pre><code>#include &quot;boost/tuple/tuple_comparison.hpp&quot;</code></pre>

-<p>To use tuple input and output operators,</p>
+<p>To use tuple input and output operators,

 <pre><code>#include &quot;boost/tuple/tuple_io.hpp&quot;</code></pre>

-<p>Both <code>tuple_io.hpp</code> and <code>tuple_comparison.hpp</code> include <code>tuple.hpp</code>.</p>
+Both <code>tuple_io.hpp</code> and <code>tuple_comparison.hpp</code> include <code>tuple.hpp</code>.

-<p>All definitions are in namespace <code>::boost::tuples</code>, but the most common names are lifted to namespace
-<code>::boost</code> with using declarations. These names are: <code>tuple</code>, <code>make_tuple</code>, <code>tie</code> and <code>get</code>.
-Further, <code>ref</code> and <code>cref</code> are defined directly under the <code>::boost</code> namespace.</p>
+<p>All definitions are in namespace <code>::boost::tuples</code>, but the most common names are lifted to namespace <code>::boost</code> with using declarations. These names are: <code>tuple</code>, <code>make_tuple</code>, <code>tie</code> and <code>get</code>. Further, <code>ref</code> and <code>cref</code> are defined directly under the <code>::boost</code> namespace.

 <h2><a name = "tuple_types">Tuple types</a></h2>

@ -83,11 +80,11 @@ C++ types, but objects of such types cannot exist.
 Hence, if a tuple type contains such types as elements, the tuple type
 can exist, but not an object of that type.
 There are natural limitations for element types that cannot
-be copied, or that are not default constructible (see 'Constructing tuples'
- below). </p>
+be be copied, or that are not default constructible (see 'Constructing tuples'
+ below). 

 <p>
-For example, the following definitions are valid tuple instantiations (<code>A</code>, <code>B</code> and <code>C</code> are some user defined classes):</p>
+For example, the following definitions are valid tuple instantiations (<code>A</code>, <code>B</code> and <code>C</code> are some user defined classes):

 <pre><code>tuple&lt;int&gt;
 tuple&lt;double&amp;, const double&amp;, const double, double*, const double*&gt;
@ -101,7 +98,7 @@ tuple&lt;A*, tuple&lt;const A*, const B&amp;, C&gt;, bool, void*&gt;
 <p>
 The tuple constructor takes the tuple elements as arguments. 
 For an <i>n</i>-element tuple, the constructor can be invoked with <i>k</i> arguments, where 0 &lt;= <i>k</i> &lt;= <i>n</i>.
-For example:</p>
+For example:
 <pre><code>tuple&lt;int, double&gt;() 
 tuple&lt;int, double&gt;(1) 
 tuple&lt;int, double&gt;(1, 3.14)
@ -109,7 +106,7 @@ tuple&lt;int, double&gt;(1, 3.14)

 <p>
 If no initial value for an element is provided, it is default initialized (and hence must be default initializable).
-For example.</p>
+For example.

 <pre><code>class X {
  X(); 
@ -121,7 +118,7 @@ tuple&lt;X,X,X&gt;()                                              // error: no d
 tuple&lt;X,X,X&gt;(string(&quot;Jaba&quot;), string(&quot;Daba&quot;), string(&quot;Duu&quot;)) // ok
 </code></pre>

-<p>In particular, reference types do not have a default initialization: </p>
+In particular, reference types do not have a default initialization: 

 <pre><code>tuple&lt;double&amp;&gt;()                // error: reference must be 
                                // initialized explicitly
@ -137,7 +134,7 @@ tuple&lt;const double&amp;&gt;(d+3.14)    // ok, but dangerous:
 </code></pre>

 <p>Using an initial value for an element that cannot be copied, is a compile
-time error:</p>
+time error:

 <pre><code>class Y { 
  Y(const Y&amp;); 
@ -151,15 +148,15 @@ tuple&lt;char[10], Y&gt;(a, Y()); // error, neither arrays nor Y can be copied
 tuple&lt;char[10], Y&gt;();       // ok
 </code></pre>

-<p>Note particularly that the following is perfectly ok:</p>
-<pre><code>Y y;
+Note particularly that the following is perfectly ok:
+<code><pre>Y y;
 tuple&lt;char(&amp;)[10], Y&amp;&gt;(a, y); 
 </code></pre>

-<p>It is possible to come up with a tuple type that cannot be constructed.
+It is possible to come up with a tuple type that cannot be constructed.
 This occurs if an element that cannot be initialized has a lower
 index than an element that requires initialization. 
-For example: <code>tuple&lt;char[10], int&amp;&gt;</code>.</p>
+For example: <code>tuple&lt;char[10], int&amp;&gt;</code>.

 <p>In sum, the tuple construction is semantically just a group of individual elementary constructions.
 </p>
@ -168,19 +165,19 @@ For example: <code>tuple&lt;char[10], int&amp;&gt;</code>.</p>

 <p>
 Tuples can also be constructed using the <code>make_tuple</code> (cf. <code>std::make_pair</code>) helper functions.
-This makes the construction more convenient, saving the programmer from explicitly specifying the element types:</p>
+This makes the construction more convenient, saving the programmer from explicitly specifying the element types: 
 <pre><code>tuple&lt;int, int, double&gt; add_multiply_divide(int a, int b) {
  return make_tuple(a+b, a*b, double(a)/double(b));
 }
 </code></pre>

 <p>
-By default, the element types are deduced to the plain non-reference types. E.g.: </p>
+By default, the element types are deduced to the plain non-reference types. E.g: 
 <pre><code>void foo(const A&amp; a, B&amp; b) { 
  ...
  make_tuple(a, b);
 </code></pre>
-<p>The <code>make_tuple</code> invocation results in a tuple of type <code>tuple&lt;A, B&gt;</code>.</p>
+The <code>make_tuple</code> invocation results in a tuple of type <code>tuple&lt;A, B&gt;</code>.

 <p>
 Sometimes the plain non-reference type is not desired, e.g. if the element type cannot be copied. 
@ -188,9 +185,8 @@ Therefore, the programmer can control the type deduction and state that a refere
 non-const type should be used as the element type instead.
 This is accomplished with two helper template functions: <code>ref</code> and <code>cref</code>. 
 Any argument can be wrapped with these functions to get the desired type. 
-The mechanism does not compromise const correctness since a const object wrapped with <code>ref</code> results
-in a tuple element with const reference type (see the fifth example below).
-For example:</p>
+The mechanism does not compromise const correctness since a const object wrapped with <code>ref</code> results in a tuple element with const reference type (see the fifth code line below).
+For example:

 <pre><code>A a; B b; const A ca = a;
 make_tuple(cref(a), b);      // creates tuple&lt;const A&amp;, B&gt;
@ -202,19 +198,19 @@ make_tuple(ref(ca));         // creates tuple&lt;const A&amp;&gt;


 <p>
-Array arguments to <code>make_tuple</code> functions are deduced to reference to const types by default; there is no need to wrap them with <code>cref</code>. For example:</p>
+Array arguments to <code>make_tuple</code> functions are deduced to reference to const types by default; there is no need to wrap them with <code>cref</code>. For example:
 <pre><code>make_tuple(&quot;Donald&quot;, &quot;Daisy&quot;);
 </code></pre>

-<p>This creates an object of type <code>tuple&lt;const char (&amp;)[7], const char (&amp;)[6]&gt;</code> 
+This creates an object of type <code>tuple&lt;const char (&amp;)[7], const char (&amp;)[6]&gt;</code> 
 (note that the type of a string literal is an array of const characters, not <code>const char*</code>). 
 However, to get <code>make_tuple</code> to create a tuple with an element of a
-non-const array type one must use the <code>ref</code> wrapper.</p>
+non-const array type one must use the <code>ref</code> wrapper.

 <p>
 Function pointers are deduced to the plain non-reference type, that is, to plain function pointer. 
 A tuple can also hold a reference to a function, 
-but such a tuple cannot be constructed with <code>make_tuple</code> (a const qualified function type would result, which is illegal):</p>
+but such a tuple cannot be constructed with <code>make_tuple</code> (a const qualified function type would result, which is illegal):
 <pre><code>void f(int i);
  ...
 make_tuple(&amp;f); // tuple&lt;void (*)(int)&gt;
@ -226,19 +222,19 @@ make_tuple(f);                    // not ok
 <h2><a name = "accessing_elements">Accessing tuple elements</a></h2>

 <p>
-Tuple elements are accessed with the expression:</p>
+Tuple elements are accessed with the expression:

 <pre><code>t.get&lt;N&gt;()
 </code></pre>
-<p>or</p>
+or
 <pre><code>get&lt;N&gt;(t)
 </code></pre>
-<p>where <code>t</code> is a tuple object and <code>N</code> is a constant integral expression specifying the index of the element to be accessed.
+where <code>t</code> is a tuple object and <code>N</code> is a constant integral expression specifying the index of the element to be accessed.
 Depending on whether <code>t</code> is const or not, <code>get</code> returns the <code>N</code>th element as a reference to const or
 non-const type.
 The index of the first element is 0 and thus<code>
 N</code> must be between 0 and <code>k-1</code>, where <code>k</code> is the number of elements in the tuple. 
-Violations of  these constraints are detected at compile time. Examples:</p>
+Violations of  these constrains are detected at compile time. Examples:

 <pre><code>double d = 2.7; A a;
 tuple&lt;int, double&amp;, const A&amp;&gt; t(1, d, a);
@ -257,18 +253,16 @@ A aa = get&lt;3&gt;(t);     // error: index out of bounds
 ++get&lt;0&gt;(t);  // ok, can be used as any variable
 </code></pre>

-<p>
 Note! The member get functions are not supported with MS Visual C++ compiler.
 Further, the compiler has trouble with finding the non-member get functions without an explicit namespace qualifier. 
-Hence, all <code>get</code> calls should be qualified as: <code>tuples::get&lt;N&gt;(a_tuple)</code> when writing code that should compile with MSVC++ 6.0.
-</p>
+Hence, all <code>get</code> calls should be qualified as: <code>tuples::get&lt;N&gt;(a_tuple)</code> when writing code that shoud compile with MSVC++ 6.0.

 <h2><a name = "construction_and_assignment">Copy construction and tuple assignment</a></h2>

 <p>
 A tuple can be copy constructed from another tuple, provided that the element types are element-wise copy constructible.
 Analogously, a tuple can be assigned to another tuple, provided that the element types are element-wise assignable.
-For example:</p>
+For example:

 <pre><code>class A {};
 class B : public A {};
@ -280,32 +274,32 @@ tuple&lt;int, A*, C, C&gt; a(t); // ok
 a = t;                     // ok 
 </code></pre>

-<p>In both cases, the conversions performed are: <code>char -> int</code>, <code>B* -> A*</code> (derived class pointer to base class pointer),  <code>B -> C</code> (a user defined conversion) and <code>D -> C</code> (a user defined conversion).</p>
+In both cases, the conversions performed are: <code>char -> int</code>, <code>B* -> A*</code> (derived class pointer to base class pointer),  <code>B -> C</code> (a user defined conversion) and <code>D -> C</code> (a user defined conversion).

 <p>
-Note that assignment is also defined from <code>std::pair</code> types:</p>
+Note that assignment is also defined from <code>std::pair</code> types:

 <pre><code>tuple&lt;float, int&gt; a = std::make_pair(1, 'a');
 </code></pre>

 <h2><a name = "relational_operators">Relational operators</a></h2>
 <p>
-Tuples reduce the operators <code>==, !=, &lt;, &gt;, &lt;=</code> and <code>>=</code> to the corresponding elementary operators. 
+Tuples reduce the operators <code>==, !=, &lt;, >, &lt;=</code> and <code>>=</code> to the corresponding elementary operators. 
 This means, that if any of these operators is defined between all elements of two tuples, then the same operator is defined between the tuples as well.

-The equality operators for two tuples <code>a</code> and <code>b</code> are defined as:</p>
+The equality operators for two tuples <code>a</code> and <code>b</code> are defined as:
 <ul>
 <li><code>a == b</code> iff for each <code>i</code>: <code>a<sub>i</sub> == b<sub>i</sub></code></li>
 <li><code>a != b</code> iff exists <code>i</code>: <code>a<sub>i</sub> != b<sub>i</sub></code></li>
 </ul>

-<p>The operators <code>&lt;, &gt;, &lt;=</code> and <code>&gt;=</code> implement a lexicographical ordering.</p>
+The operators <code>&lt;, >, &lt;=</code> and <code>>=</code> implement a lexicographical ordering.

 <p>
-Note that an attempt to compare two tuples of different lengths results in a compile time error.
-Also, the comparison operators are <i>"short-circuited"</i>: elementary comparisons start from the first elements and are performed only until the result is clear.</p>
+Note that an attempt to compare two tuples of different lengths results in a compile time error.</p>
+Also, the comparison operators are <i>"short-circuited"</i>: elementary comparisons start from the first elements and are performed only until the result is clear.

-<p>Examples:</p>
+<p>Examples:

 <pre><code>tuple&lt;std::string, int, A&gt; t1(std::string(&quot;same?&quot;), 2, A());
 tuple&lt;std::string, long, A&gt; t2(std::string(&quot;same?&quot;), 2, A());
@ -322,7 +316,7 @@ t1 == t3;               // false, does not print &quot;All the...&quot;

 <p>
 <i>Tiers</i> are tuples, where all elements are of non-const reference types.
-They are constructed with a call to the <code>tie</code> function template (cf. <code>make_tuple</code>):</p>
+They are constructed with a call to the <code>tie</code> function template (cf. <code>make_tuple</code>):

 <pre><code>int i; char c; double d; 
  ...
@ -335,26 +329,26 @@ The same result could be achieved with the call <code>make_tuple(ref(i), ref(c),
 </p>

 <p>
-A tuple that contains non-const references as elements can be used to 'unpack' another tuple into variables. E.g.:</p>
+A tuple that contains non-const references as elements can be used to 'unpack' another tuple into variables. E.g.:

 <pre><code>int i; char c; double d; 
 tie(i, c, d) = make_tuple(1,'a', 5.5);
 std::cout &lt;&lt; i &lt;&lt; &quot; &quot; &lt;&lt;  c &lt;&lt; &quot; &quot; &lt;&lt; d;
 </code></pre>
-<p>This code prints <code>1 a 5.5</code> to the standard output stream.
+This code prints <code>1 a 5.5</code> to the standard output stream.

 A tuple unpacking operation like this is found for example in ML and Python. 
-It is convenient when calling functions which return tuples.</p>
+It is convenient when calling functions which return tuples.

 <p>
-The tying mechanism works with <code>std::pair</code> templates as well:</p>
+The tying mechanism works with <code>std::pair</code> templates as well:

 <pre><code>int i; char c;
 tie(i, c) = std::make_pair(1, 'a');
 </code></pre>
 <h4>Ignore</h4>
-<p>There is also an object called <code>ignore</code> which allows you to ignore an element assigned by a tuple.
-The idea is that a function may return a tuple, only part of which you are interested in. For example (note, that <code>ignore</code> is under the <code>tuples</code> subnamespace):</p>
+There is also an object called <code>ignore</code> which allows you to ignore an element assigned by a tuple.
+The idea is that a function may return a tuple, only part of which you are interested in. For example (note, that <code>ignore</code> is under the <code>tuples</code> subnamespace):

 <pre><code>char c;
 tie(tuples::ignore, c) = std::make_pair(1, 'a');
@ -380,10 +374,10 @@ For Example:

 cout &lt;&lt; a; 
 </code></pre>
-<p>outputs the tuple as: <code>(1.0 2 Howdy folks!)</code></p>
+outputs the tuple as: <code>(1.0 2 Howdy folks!)</code>

 <p>
-The library defines three <i>manipulators</i> for changing the default behavior:</p>
+The library defines three <i>manipulators</i> for changing the default behavior:
 <ul>
 <li><code>set_open(char)</code> defines the character that is output before the first
 element.</li>
@ -393,27 +387,27 @@ last element.</li>
 elements.</li>
 </ul>

-<p>Note, that these manipulators are defined in the <code>tuples</code> subnamespace.
-For example:</p>
-<pre><code>cout &lt;&lt; tuples::set_open('[') &lt;&lt; tuples::set_close(']') &lt;&lt; tuples::set_delimiter(',') &lt;&lt; a; 
+Note, that these manipulators are defined in the <code>tuples</code> subnamespace. 
+For example:
+<code><pre>cout &lt;&lt; tuples::set_open('[') &lt;&lt; tuples::set_close(']') &lt;&lt; tuples::set_delimiter(',') &lt;&lt; a; 
 </code></pre>
-<p>outputs the same tuple <code>a</code> as: <code>[1.0,2,Howdy folks!]</code></p>
+outputs the same tuple <code>a</code> as: <code>[1.0,2,Howdy folks!]</code>

 <p>The same manipulators work with <code>operator&gt;&gt;</code> and <code>istream</code> as well. Suppose the <code>cin</code> stream contains the following data:

 <pre><code>(1 2 3) [4:5]</code></pre>

-<p>The code:</p>
+The code:

-<pre><code>tuple&lt;int, int, int&gt; i;
+<code><pre>tuple&lt;int, int, int&gt; i;
 tuple&lt;int, int&gt; j;

 cin &gt;&gt; i;
-cin &gt;&gt; tuples::set_open('[') &gt;&gt; tuples::set_close(']') &gt;&gt; tuples::set_delimiter(':');
+cin &gt;&gt; tuples::set_open('[') &gt;&gt; tuples::set_close(']') &gt;&gt; tules::set_delimiter(':');
 cin &gt;&gt; j;
 </code></pre>

-<p>reads the data into the tuples <code>i</code> and <code>j</code>.</p>
+reads the data into the tuples <code>i</code> and <code>j</code>.

 <p>
 Note that extracting tuples with <code>std::string</code> or C-style string
@ -423,9 +417,9 @@ parseable.

 <h2><a name = "performance">Performance</a></h2>

-<p>All tuple access and construction functions are small inlined one-liners. 
-Therefore, a decent compiler can eliminate any extra cost of using tuples compared to using hand-written tuple like classes. 
-Particularly, with a decent compiler there is no performance difference between this code:</p>
+All tuple access and construction functions are small inlined one-liners. 
+Therefore, a decent compiler can eliminate any extra cost of using tuples compared to using hand written tuple like classes. 
+Particularly, with a decent compiler there is no performance difference between this code:

 <pre><code>class hand_made_tuple { 
  A a; B b; C c;
@ -441,7 +435,7 @@ hand_made_tuple hmt(A(), B(), C());
 hmt.getA(); hmt.getB(); hmt.getC();
 </code></pre>

-<p>and this code:</p>
+and this code:

 <pre><code>tuple&lt;A, B, C&gt; t(A(), B(), C());
 t.get&lt;0&gt;(); t.get&lt;1&gt;(); t.get&lt;2&gt;(); 
@ -452,23 +446,23 @@ t.get&lt;0&gt;(); t.get&lt;1&gt;(); t.get&lt;2&gt;();
 <p>
 Depending on the optimizing ability of the compiler, the tier mechanism may have a small performance penalty compared to using
 non-const reference parameters as a mechanism for returning multiple values from a function. 
-For example, suppose that the following functions <code>f1</code> and <code>f2</code> have equivalent functionalities:</p>
+For example, suppose that the following functions <code>f1</code> and <code>f2</code> have equivalent functionalities:

 <pre><code>void f1(int&amp;, double&amp;);
 tuple&lt;int, double&gt; f2();
 </code></pre>

-<p>Then, the call #1 may be slightly faster than #2 in the code below:</p>
+Then, the call #1 may be slightly faster than #2 in the code below:

 <pre><code>int i; double d;
  ...
 f1(i,d);         // #1
 tie(i,d) = f2(); // #2
 </code></pre>
-<p>See 
+See 
 [<a href="#publ_1">1</a>,
 <a href="#publ_2">2</a>]
- for more in-depth discussions about efficiency.</p>
+ for more in-depth discussions about efficiency.

 <h4>Effect on Compile Time</h4>

@ -476,7 +470,7 @@ tie(i,d) = f2(); // #2
 Compiling tuples can be slow due to the excessive amount of template instantiations.
 Depending on the compiler and the tuple length, it may be more than 10 times slower to compile a tuple construct, compared to compiling an equivalent explicitly written class, such as the <code>hand_made_tuple</code> class above.
 However, as a realistic program is likely to contain a lot of code in addition to tuple definitions, the difference is probably unnoticeable.
-Compile time increases between 5 and 10 percent were measured for programs which used tuples very frequently.
+Compile time increases between 5 to 10 percentages were measured for programs which used tuples very frequently.
 With the same test programs, memory consumption of compiling increased between 22% to 27%. See  
 [<a href="#publ_1">1</a>,
 <a href="#publ_2">2</a>]
@ -498,10 +492,10 @@ Below is a list of compilers and known problems with each compiler:
 </table>

 <h2><a name = "thanks">Acknowledgements</a></h2>
-<p>Gary Powell has been an indispensable helping hand. In particular, stream manipulators for tuples were his idea. Doug Gregor came up with a working version for MSVC, David Abrahams found a way to get rid of most of the restrictions for compilers not supporting partial specialization. Thanks to Jeremy Siek, William Kempf and Jens Maurer for their help and suggestions. 
+Gary Powell has been an indispensable helping hand. In particular, stream manipulators for tuples were his idea. Doug Gregor came up with a working version for MSVC, David Abrahams found a way to get rid of most of the restrictions for compilers not supporting partial specialization. Thanks to Jeremy Siek, William Kempf and Jens Maurer for their help and suggestions. 
 The comments by Vesa Karvonen, John Max Skaller, Ed Brey, Beman Dawes, David Abrahams and Hartmut Kaiser helped to improve the
 library.
-The idea for the tie mechanism came from an old usenet article by Ian McCulloch, where he proposed something similar for std::pairs.</p>
+The idea for the tie mechanism came from an old usenet article by Ian McCulloch, where he proposed something similar for std::pairs.
 <h2><a name = "references">References</a></h2>

 <p>
@ -522,7 +516,7 @@ J&auml;rvi J.: <i>ML-Style Tuple Assignment in Standard C++ - Extending the Mult

 <p>Last modified 2003-09-07</p>

-<p>&copy; Copyright <a href="http://www.boost.org/people/jaakko_jarvi.htm"> Jaakko J&auml;rvi</a> 2001. 
+<p>&copy; Copyright <a href="../../../people/jaakko_jarvi.htm"> Jaakko J&auml;rvi</a> 2001. 

 Permission to copy, use, modify, sell and distribute this software and its documentation is granted provided this copyright notice appears in all copies. 
 This software and its documentation is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose.
--- a/include/boost/tuple/detail/tuple_basic.hpp
+++ b/include/boost/tuple/detail/tuple_basic.hpp
@ -1,6 +1,6 @@
 //  tuple_basic.hpp -----------------------------------------------------

-// Copyright (C) 1999, 2000 Jaakko Jarvi (jaakko.jarvi@cs.utu.fi)
+// Copyright (C) 1999, 2000 Jaakko J<EFBFBD>rvi (jaakko.jarvi@cs.utu.fi)
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@ -37,7 +37,6 @@

 #include "boost/type_traits/cv_traits.hpp"
 #include "boost/type_traits/function_traits.hpp"
-#include "boost/utility/swap.hpp"

 #include "boost/detail/workaround.hpp" // needed for BOOST_WORKAROUND

@ -87,28 +86,45 @@ namespace detail {
 template<class T>
 class generate_error;

-template<int N>
-struct drop_front {
-    template<class Tuple>
-    struct apply {
-        typedef BOOST_DEDUCED_TYPENAME drop_front<N-1>::BOOST_NESTED_TEMPLATE
-            apply<Tuple> next;
-        typedef BOOST_DEDUCED_TYPENAME next::type::tail_type type;
-        static const type& call(const Tuple& tup) {
-            return next::call(tup).tail;
-        }
-    };
+// - cons getters --------------------------------------------------------
+// called: get_class<N>::get<RETURN_TYPE>(aTuple)
+
+template< int N >
+struct get_class {
+  template<class RET, class HT, class TT >
+  inline static RET get(const cons<HT, TT>& t)
+  {
+#if BOOST_WORKAROUND(__IBMCPP__,==600)
+    // vacpp 6.0 is not very consistent regarding the member template keyword
+    // Here it generates an error when the template keyword is used.
+    return get_class<N-1>::get<RET>(t.tail);
+#else
+    return get_class<N-1>::BOOST_NESTED_TEMPLATE get<RET>(t.tail);
+#endif
+  }
+  template<class RET, class HT, class TT >
+  inline static RET get(cons<HT, TT>& t)
+  {
+#if BOOST_WORKAROUND(__IBMCPP__,==600)
+    return get_class<N-1>::get<RET>(t.tail);
+#else
+    return get_class<N-1>::BOOST_NESTED_TEMPLATE get<RET>(t.tail);
+#endif
+  }
 };

 template<>
-struct drop_front<0> {
-    template<class Tuple>
-    struct apply {
-        typedef Tuple type;
-        static const type& call(const Tuple& tup) {
-            return tup;
-        }
-    };
+struct get_class<0> {
+  template<class RET, class HT, class TT>
+  inline static RET get(const cons<HT, TT>& t)
+  {
+    return t.head;
+  }
+  template<class RET, class HT, class TT>
+  inline static RET get(cons<HT, TT>& t)
+  {
+    return t.head;
+  }
 };

 } // end of namespace detail
@ -124,23 +140,41 @@ struct drop_front<0> {
 template<int N, class T>
 struct element
 {
-  typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
-      apply<T>::type::head_type type;
+private:
+  typedef typename T::tail_type Next;
+public:
+  typedef typename element<N-1, Next>::type type;
+};
+template<class T>
+struct element<0,T>
+{
+  typedef typename T::head_type type;
 };

 template<int N, class T>
 struct element<N, const T>
 {
 private:
-  typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
-      apply<T>::type::head_type unqualified_type;
+  typedef typename T::tail_type Next;
+  typedef typename element<N-1, Next>::type unqualified_type;
 public:
 #if BOOST_WORKAROUND(__BORLANDC__,<0x600)
  typedef const unqualified_type type;
 #else
-  typedef BOOST_DEDUCED_TYPENAME boost::add_const<unqualified_type>::type type;
+  typedef typename boost::add_const<unqualified_type>::type type;
+#endif
+
+};
+template<class T>
+struct element<0,const T>
+{
+#if BOOST_WORKAROUND(__BORLANDC__,<0x600)
+  typedef const typename T::head_type type;
+#else
+  typedef typename boost::add_const<typename T::head_type>::type type;
 #endif
 };
+
 #else // def BOOST_NO_CV_SPECIALIZATIONS

 namespace detail {
@ -148,23 +182,38 @@ namespace detail {
 template<int N, class T, bool IsConst>
 struct element_impl
 {
-  typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
-      apply<T>::type::head_type type;
+private:
+  typedef typename T::tail_type Next;
+public:
+  typedef typename element_impl<N-1, Next, IsConst>::type type;
 };

 template<int N, class T>
 struct element_impl<N, T, true /* IsConst */>
 {
-  typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
-      apply<T>::type::head_type unqualified_type;
-  typedef const unqualified_type type;
+private:
+  typedef typename T::tail_type Next;
+public:
+  typedef const typename element_impl<N-1, Next, true>::type type;
+};
+
+template<class T>
+struct element_impl<0, T, false /* IsConst */>
+{
+  typedef typename T::head_type type;
+};
+
+template<class T>
+struct element_impl<0, T, true /* IsConst */>
+{
+  typedef const typename T::head_type type;
 };

 } // end of namespace detail


 template<int N, class T>
-struct element:
+struct element: 
  public detail::element_impl<N, T, ::boost::is_const<T>::value>
 {
 };
@ -209,10 +258,17 @@ inline typename access_traits<
                  typename element<N, cons<HT, TT> >::type
                >::non_const_type
 get(cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) {
-  typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
-      apply<cons<HT, TT> > impl;
-  typedef BOOST_DEDUCED_TYPENAME impl::type cons_element;
-  return const_cast<cons_element&>(impl::call(c)).head;
+#if BOOST_WORKAROUND(__IBMCPP__,==600 )
+  return detail::get_class<N>::
+#else
+  return detail::get_class<N>::BOOST_NESTED_TEMPLATE
+#endif
+         get<
+           typename access_traits<
+             typename element<N, cons<HT, TT> >::type
+           >::non_const_type,
+           HT,TT
+         >(c);
 }

 // get function for const cons-lists, returns a const reference to
@ -223,10 +279,17 @@ inline typename access_traits<
                  typename element<N, cons<HT, TT> >::type
                >::const_type
 get(const cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) {
-  typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
-      apply<cons<HT, TT> > impl;
-  typedef BOOST_DEDUCED_TYPENAME impl::type cons_element;
-  return impl::call(c).head;
+#if BOOST_WORKAROUND(__IBMCPP__,==600)
+  return detail::get_class<N>::
+#else
+  return detail::get_class<N>::BOOST_NESTED_TEMPLATE
+#endif
+         get<
+           typename access_traits<
+             typename element<N, cons<HT, TT> >::type
+           >::const_type,
+           HT,TT
+         >(c);
 }

 // -- the cons template  --------------------------------------------------
@ -425,20 +488,11 @@ struct length<tuple<> > {
  BOOST_STATIC_CONSTANT(int, value = 0);
 };

-template<>
-struct length<tuple<> const> {
-  BOOST_STATIC_CONSTANT(int, value = 0);
-};
-
 template<>
 struct length<null_type> {
  BOOST_STATIC_CONSTANT(int, value = 0);
 };

-template<>
-struct length<null_type const> {
-  BOOST_STATIC_CONSTANT(int, value = 0);
-};

 namespace detail {

@ -600,21 +654,18 @@ public:
 // Swallows any assignment   (by Doug Gregor)
 namespace detail {

-struct swallow_assign;
-typedef void (detail::swallow_assign::*ignore_t)();
 struct swallow_assign {
-  swallow_assign(ignore_t(*)(ignore_t)) {}
+
  template<typename T>
  swallow_assign const& operator=(const T&) const {
    return *this;
  }
 };

-
 } // namespace detail

 // "ignore" allows tuple positions to be ignored when using "tie".
-inline detail::ignore_t ignore(detail::ignore_t) { return 0; }
+detail::swallow_assign const ignore = detail::swallow_assign();

 // ---------------------------------------------------------------------------
 // The call_traits for make_tuple
@ -696,10 +747,6 @@ struct make_tuple_traits<const reference_wrapper<T> >{
  typedef T& type;
 };

-template<>
-struct make_tuple_traits<detail::ignore_t(detail::ignore_t)> {
-  typedef detail::swallow_assign type;
-};



@ -821,154 +868,71 @@ make_tuple(const T0& t0, const T1& t1, const T2& t2, const T3& t3,
  return t(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9);
 }

-namespace detail {

-template<class T>
-struct tie_traits {
-  typedef T& type;
-};
-
-template<>
-struct tie_traits<ignore_t(ignore_t)> {
-  typedef swallow_assign type;
-};
-
-template<>
-struct tie_traits<void> {
-  typedef null_type type;
-};
-
-template <
-  class T0 = void, class T1 = void, class T2 = void,
-  class T3 = void, class T4 = void, class T5 = void,
-  class T6 = void, class T7 = void, class T8 = void,
-  class T9 = void
->
-struct tie_mapper {
-  typedef
-    tuple<typename tie_traits<T0>::type,
-          typename tie_traits<T1>::type,
-          typename tie_traits<T2>::type,
-          typename tie_traits<T3>::type,
-          typename tie_traits<T4>::type,
-          typename tie_traits<T5>::type,
-          typename tie_traits<T6>::type,
-          typename tie_traits<T7>::type,
-          typename tie_traits<T8>::type,
-          typename tie_traits<T9>::type> type;
-};
-
-}

 // Tie function templates -------------------------------------------------
-template<class T0>
-inline typename detail::tie_mapper<T0>::type
-tie(T0& t0) {
-  typedef typename detail::tie_mapper<T0>::type t;
-  return t(t0);
+template<class T1>
+inline tuple<T1&> tie(T1& t1) {
+  return tuple<T1&> (t1);
 }

-template<class T0, class T1>
-inline typename detail::tie_mapper<T0, T1>::type
-tie(T0& t0, T1& t1) {
-  typedef typename detail::tie_mapper<T0, T1>::type t;
-  return t(t0, t1);
+template<class T1, class T2>
+inline tuple<T1&, T2&> tie(T1& t1, T2& t2) {
+  return tuple<T1&, T2&> (t1, t2);
 }

-template<class T0, class T1, class T2>
-inline typename detail::tie_mapper<T0, T1, T2>::type
-tie(T0& t0, T1& t1, T2& t2) {
-  typedef typename detail::tie_mapper<T0, T1, T2>::type t;
-  return t(t0, t1, t2);
+template<class T1, class T2, class T3>
+inline tuple<T1&, T2&, T3&> tie(T1& t1, T2& t2, T3& t3) {
+  return tuple<T1&, T2&, T3&> (t1, t2, t3);
 }

-template<class T0, class T1, class T2, class T3>
-inline typename detail::tie_mapper<T0, T1, T2, T3>::type
-tie(T0& t0, T1& t1, T2& t2, T3& t3) {
-  typedef typename detail::tie_mapper<T0, T1, T2, T3>::type t;
-  return t(t0, t1, t2, t3);
+template<class T1, class T2, class T3, class T4>
+inline tuple<T1&, T2&, T3&, T4&> tie(T1& t1, T2& t2, T3& t3, T4& t4) {
+  return tuple<T1&, T2&, T3&, T4&> (t1, t2, t3, t4);
 }

-template<class T0, class T1, class T2, class T3, class T4>
-inline typename detail::tie_mapper<T0, T1, T2, T3, T4>::type
-tie(T0& t0, T1& t1, T2& t2, T3& t3,
-                  T4& t4) {
-  typedef typename detail::tie_mapper<T0, T1, T2, T3, T4>::type t;
-  return t(t0, t1, t2, t3, t4);
+template<class T1, class T2, class T3, class T4, class T5>
+inline tuple<T1&, T2&, T3&, T4&, T5&>
+tie(T1& t1, T2& t2, T3& t3, T4& t4, T5& t5) {
+  return tuple<T1&, T2&, T3&, T4&, T5&> (t1, t2, t3, t4, t5);
 }

-template<class T0, class T1, class T2, class T3, class T4, class T5>
-inline typename detail::tie_mapper<T0, T1, T2, T3, T4, T5>::type
-tie(T0& t0, T1& t1, T2& t2, T3& t3,
-                  T4& t4, T5& t5) {
-  typedef typename detail::tie_mapper<T0, T1, T2, T3, T4, T5>::type t;
-  return t(t0, t1, t2, t3, t4, t5);
+template<class T1, class T2, class T3, class T4, class T5, class T6>
+inline tuple<T1&, T2&, T3&, T4&, T5&, T6&>
+tie(T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6) {
+  return tuple<T1&, T2&, T3&, T4&, T5&, T6&> (t1, t2, t3, t4, t5, t6);
 }

-template<class T0, class T1, class T2, class T3, class T4, class T5, class T6>
-inline typename detail::tie_mapper<T0, T1, T2, T3, T4, T5, T6>::type
-tie(T0& t0, T1& t1, T2& t2, T3& t3,
-                  T4& t4, T5& t5, T6& t6) {
-  typedef typename detail::tie_mapper
-           <T0, T1, T2, T3, T4, T5, T6>::type t;
-  return t(t0, t1, t2, t3, t4, t5, t6);
+template<class T1, class T2, class T3, class T4, class T5, class T6, class T7>
+inline tuple<T1&, T2&, T3&, T4&, T5&, T6&, T7&>
+tie(T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6, T7& t7) {
+  return tuple<T1&, T2&, T3&, T4&, T5&, T6&, T7&> (t1, t2, t3, t4, t5, t6, t7);
 }

-template<class T0, class T1, class T2, class T3, class T4, class T5, class T6,
-         class T7>
-inline typename detail::tie_mapper<T0, T1, T2, T3, T4, T5, T6, T7>::type
-tie(T0& t0, T1& t1, T2& t2, T3& t3,
-                  T4& t4, T5& t5, T6& t6, T7& t7) {
-  typedef typename detail::tie_mapper
-           <T0, T1, T2, T3, T4, T5, T6, T7>::type t;
-  return t(t0, t1, t2, t3, t4, t5, t6, t7);
+template<class T1, class T2, class T3, class T4, class T5, class T6, class T7,
+         class T8>
+inline tuple<T1&, T2&, T3&, T4&, T5&, T6&, T7&, T8&>
+tie(T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6, T7& t7, T8& t8) {
+  return tuple<T1&, T2&, T3&, T4&, T5&, T6&, T7&, T8&>
+           (t1, t2, t3, t4, t5, t6, t7, t8);
 }

-template<class T0, class T1, class T2, class T3, class T4, class T5, class T6,
-         class T7, class T8>
-inline typename detail::tie_mapper
-  <T0, T1, T2, T3, T4, T5, T6, T7, T8>::type
-tie(T0& t0, T1& t1, T2& t2, T3& t3,
-                  T4& t4, T5& t5, T6& t6, T7& t7,
-                  T8& t8) {
-  typedef typename detail::tie_mapper
-           <T0, T1, T2, T3, T4, T5, T6, T7, T8>::type t;
-  return t(t0, t1, t2, t3, t4, t5, t6, t7, t8);
+template<class T1, class T2, class T3, class T4, class T5, class T6, class T7,
+         class T8, class T9>
+inline tuple<T1&, T2&, T3&, T4&, T5&, T6&, T7&, T8&, T9&>
+tie(T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6, T7& t7, T8& t8,
+           T9& t9) {
+  return tuple<T1&, T2&, T3&, T4&, T5&, T6&, T7&, T8&, T9&>
+            (t1, t2, t3, t4, t5, t6, t7, t8, t9);
 }

-template<class T0, class T1, class T2, class T3, class T4, class T5, class T6,
-         class T7, class T8, class T9>
-inline typename detail::tie_mapper
-  <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>::type
-tie(T0& t0, T1& t1, T2& t2, T3& t3,
-                  T4& t4, T5& t5, T6& t6, T7& t7,
-                  T8& t8, T9& t9) {
-  typedef typename detail::tie_mapper
-           <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>::type t;
-  return t(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9);
-}
-
-template <class T0, class T1, class T2, class T3, class T4,
-          class T5, class T6, class T7, class T8, class T9>
-void swap(tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& lhs,
-          tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& rhs);
-inline void swap(null_type&, null_type&) {}
-template<class HH>
-inline void swap(cons<HH, null_type>& lhs, cons<HH, null_type>& rhs) {
-  ::boost::swap(lhs.head, rhs.head);
-}
-template<class HH, class TT>
-inline void swap(cons<HH, TT>& lhs, cons<HH, TT>& rhs) {
-  ::boost::swap(lhs.head, rhs.head);
-  ::boost::tuples::swap(lhs.tail, rhs.tail);
-}
-template <class T0, class T1, class T2, class T3, class T4,
-          class T5, class T6, class T7, class T8, class T9>
-inline void swap(tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& lhs,
-          tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& rhs) {
-  typedef tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> tuple_type;
-  typedef typename tuple_type::inherited base;
-  ::boost::tuples::swap(static_cast<base&>(lhs), static_cast<base&>(rhs));
+template<class T1, class T2, class T3, class T4, class T5, class T6, class T7,
+         class T8, class T9, class T10>
+inline tuple<T1&, T2&, T3&, T4&, T5&, T6&, T7&, T8&, T9&, T10&>
+tie(T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6, T7& t7, T8& t8,
+           T9& t9, T10& t10) {
+  return tuple<T1&, T2&, T3&, T4&, T5&, T6&, T7&, T8&, T9&, T10&>
+           (t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);
 }

 } // end of namespace tuples
--- a/include/boost/tuple/detail/tuple_basic_no_partial_spec.hpp
+++ b/include/boost/tuple/detail/tuple_basic_no_partial_spec.hpp
@ -1,6 +1,6 @@
 // - tuple_basic_no_partial_spec.hpp -----------------------------------------

-// Copyright (C) 1999, 2000 Jaakko Jarvi (jaakko.jarvi@cs.utu.fi)
+// Copyright (C) 1999, 2000 Jaakko J<EFBFBD>rvi (jaakko.jarvi@cs.utu.fi)
 // Copyright (C) 2001 Douglas Gregor (gregod@rpi.edu)
 // Copyright (C) 2001 Gary Powell (gary.powell@sierra.com)
 //
@ -27,7 +27,6 @@
 #define BOOST_TUPLE_BASIC_NO_PARTIAL_SPEC_HPP

 #include "boost/type_traits.hpp"
-#include "boost/utility/swap.hpp"
 #include <utility>

 #if defined BOOST_MSVC
@ -837,29 +836,6 @@ namespace tuples {

 detail::swallow_assign const ignore = detail::swallow_assign();

-template <class T0, class T1, class T2, class T3, class T4,
-          class T5, class T6, class T7, class T8, class T9>
-void swap(tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& lhs,
-          tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& rhs);
-inline void swap(null_type&, null_type&) {}
-template<class HH>
-inline void swap(cons<HH, null_type>& lhs, cons<HH, null_type>& rhs) {
-  ::boost::swap(lhs.head, rhs.head);
-}
-template<class HH, class TT>
-inline void swap(cons<HH, TT>& lhs, cons<HH, TT>& rhs) {
-  ::boost::swap(lhs.head, rhs.head);
-  ::boost::tuples::swap(lhs.tail, rhs.tail);
-}
-template <class T0, class T1, class T2, class T3, class T4,
-          class T5, class T6, class T7, class T8, class T9>
-inline void swap(tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& lhs,
-          tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& rhs) {
-  typedef tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> tuple_type;
-  typedef typename tuple_type::inherited base;
-  ::boost::tuples::swap(static_cast<base&>(lhs), static_cast<base&>(rhs));
-}
-
 } // namespace tuples
 } // namespace boost
 #endif // BOOST_TUPLE_BASIC_NO_PARTIAL_SPEC_HPP
--- a/include/boost/tuple/tuple.hpp
+++ b/include/boost/tuple/tuple.hpp
@ -1,6 +1,6 @@
 //  tuple.hpp - Boost Tuple Library --------------------------------------

-// Copyright (C) 1999, 2000 Jaakko Jarvi (jaakko.jarvi@cs.utu.fi)
+// Copyright (C) 1999, 2000 Jaakko J<EFBFBD>rvi (jaakko.jarvi@cs.utu.fi)
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
--- a/include/boost/tuple/tuple_comparison.hpp
+++ b/include/boost/tuple/tuple_comparison.hpp
@ -1,6 +1,6 @@
 // tuple_comparison.hpp -----------------------------------------------------
 //  
-// Copyright (C) 2001 Jaakko Jarvi (jaakko.jarvi@cs.utu.fi)
+// Copyright (C) 2001 Jaakko J<EFBFBD>rvi (jaakko.jarvi@cs.utu.fi)
 // Copyright (C) 2001 Gary Powell (gary.powell@sierra.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See
@ -69,8 +69,8 @@ inline bool neq<null_type,null_type>(const null_type&, const null_type&) { retur
 template<class T1, class T2>
 inline bool lt(const T1& lhs, const T2& rhs) {
  return lhs.get_head() < rhs.get_head()  ||
-          ( !(rhs.get_head() < lhs.get_head()) &&
-            lt(lhs.get_tail(), rhs.get_tail()));
+            !(rhs.get_head() < lhs.get_head()) &&
+            lt(lhs.get_tail(), rhs.get_tail());
 }
 template<>
 inline bool lt<null_type,null_type>(const null_type&, const null_type&) { return false; }
@ -78,8 +78,8 @@ inline bool lt<null_type,null_type>(const null_type&, const null_type&) { return
 template<class T1, class T2>
 inline bool gt(const T1& lhs, const T2& rhs) {
  return lhs.get_head() > rhs.get_head()  ||
-          ( !(rhs.get_head() > lhs.get_head()) &&
-            gt(lhs.get_tail(), rhs.get_tail()));
+            !(rhs.get_head() > lhs.get_head()) &&
+            gt(lhs.get_tail(), rhs.get_tail());
 }
 template<>
 inline bool gt<null_type,null_type>(const null_type&, const null_type&) { return false; }
--- a/include/boost/tuple/tuple_io.hpp
+++ b/include/boost/tuple/tuple_io.hpp
@ -1,6 +1,6 @@
 // tuple_io.hpp --------------------------------------------------------------

-// Copyright (C) 2001 Jaakko Jarvi (jaakko.jarvi@cs.utu.fi)
+// Copyright (C) 2001 Jaakko J<EFBFBD>rvi (jaakko.jarvi@cs.utu.fi)
 //               2001 Gary Powell (gary.powell@sierra.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See
@ -29,8 +29,6 @@
 #include <ostream>
 #endif  

-#include <sstream>
-
 #include "boost/tuple/tuple.hpp"

 // This is ugly: one should be using twoargument isspace since whitspace can
@ -246,22 +244,6 @@ print(std::ostream& o, const cons<T1, T2>& t) {

 }

-template<class T>
-inline bool handle_width(std::ostream& o, const T& t) {
-    std::streamsize width = o.width();
-    if(width == 0) return false;
-
-    std::ostringstream ss;
-
-    ss.copyfmt(o);
-    ss.tie(0);
-    ss.width(0);
-
-    ss << t;
-    o << ss.str();
-
-    return true;
-}


 #else
@ -298,48 +280,14 @@ print(std::basic_ostream<CharType, CharTrait>& o, const cons<T1, T2>& t) {
  return print(o, t.tail);
 }

-template<class CharT, class Traits, class T>
-inline bool handle_width(std::basic_ostream<CharT, Traits>& o, const T& t) {
-    std::streamsize width = o.width();
-    if(width == 0) return false;
-
-    std::basic_ostringstream<CharT, Traits> ss;
-
-    ss.copyfmt(o);
-    ss.tie(0);
-    ss.width(0);
-
-    ss << t;
-    o << ss.str();
-
-    return true;
-}
-
 #endif  // BOOST_NO_TEMPLATED_STREAMS

 } // namespace detail

 #if defined (BOOST_NO_TEMPLATED_STREAMS)
-
-inline std::ostream& operator<<(std::ostream& o, const null_type& t) {
-  if (!o.good() ) return o;
-  if (detail::handle_width(o, t)) return o;
- 
-  const char l = 
-    detail::format_info::get_manipulator(o, detail::format_info::open);
-  const char r = 
-    detail::format_info::get_manipulator(o, detail::format_info::close);
-   
-  o << l;
-  o << r;
-
-  return o;
-}
-
 template<class T1, class T2>
 inline std::ostream& operator<<(std::ostream& o, const cons<T1, T2>& t) {
  if (!o.good() ) return o;
-  if (detail::handle_width(o, t)) return o;
 
  const char l = 
    detail::format_info::get_manipulator(o, detail::format_info::open);
@ -357,30 +305,11 @@ inline std::ostream& operator<<(std::ostream& o, const cons<T1, T2>& t) {

 #else

-template<class CharType, class CharTrait>
-inline std::basic_ostream<CharType, CharTrait>& 
-operator<<(std::basic_ostream<CharType, CharTrait>& o, 
-           const null_type& t) {
-  if (!o.good() ) return o;
-  if (detail::handle_width(o, t)) return o;
- 
-  const CharType l = 
-    detail::format_info::get_manipulator(o, detail::format_info::open);
-  const CharType r = 
-    detail::format_info::get_manipulator(o, detail::format_info::close);
-   
-  o << l;
-  o << r;
-
-  return o;
-}
-
 template<class CharType, class CharTrait, class T1, class T2>
 inline std::basic_ostream<CharType, CharTrait>& 
 operator<<(std::basic_ostream<CharType, CharTrait>& o, 
           const cons<T1, T2>& t) {
  if (!o.good() ) return o;
-  if (detail::handle_width(o, t)) return o;
 
  const CharType l = 
    detail::format_info::get_manipulator(o, detail::format_info::open);
@ -423,8 +352,6 @@ extract_and_check_delimiter(
    if (is.good() && c!=d) {
      is.setstate(std::ios::failbit);
    } 
-  } else {
-    is >> std::ws;
  }
  return is;
 }
@ -519,8 +446,6 @@ extract_and_check_delimiter(
    if (is.good() && c!=d) { 
      is.setstate(std::ios::failbit);
    }
-  } else {
-    is >> std::ws;
  }
  return is;
 }
--- a/test/another_tuple_test_bench.cpp
+++ b/test/another_tuple_test_bench.cpp
@ -1,4 +1,4 @@
-// Copyright (C) 1999, 2000 Jaakko Jarvi (jaakko.jarvi@cs.utu.fi)
+// Copyright (C) 1999, 2000 Jaakko J<EFBFBD>rvi (jaakko.jarvi@cs.utu.fi)
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@ -23,6 +23,7 @@
 #include <string>
 #include <utility>

+using namespace std;
 using namespace boost;
 using namespace boost::tuples;

--- a/test/io_test.cpp
+++ b/test/io_test.cpp
@ -1,4 +1,4 @@
-// Copyright (C) 1999, 2000 Jaakko Jarvi (jaakko.jarvi@cs.utu.fi)
+// Copyright (C) 1999, 2000 Jaakko J<EFBFBD>rvi (jaakko.jarvi@cs.utu.fi)
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@ -20,7 +20,6 @@
 #include <iterator>
 #include <algorithm>
 #include <string>
-#include <iomanip>

 #if defined BOOST_NO_STRINGSTREAM
 #include <strstream>
@ -28,14 +27,15 @@
 #include <sstream>
 #endif

+using namespace std;
 using namespace boost;

 #if defined BOOST_NO_STRINGSTREAM
-typedef std::ostrstream useThisOStringStream;
-typedef std::istrstream useThisIStringStream;
+typedef ostrstream useThisOStringStream;
+typedef istrstream useThisIStringStream;
 #else
-typedef std::ostringstream useThisOStringStream;
-typedef std::istringstream useThisIStringStream;
+typedef ostringstream useThisOStringStream;
+typedef istringstream useThisIStringStream;
 #endif

 int test_main(int argc, char * argv[] ) {
@ -70,33 +70,19 @@ int test_main(int argc, char * argv[] ) {
  os1 << make_tuple(1, 2, 3);
  BOOST_CHECK (os1.str() == std::string("[1,2,3][1,2,3]") );

-  // check empty tuple.
-  useThisOStringStream os3;
-  os3 << make_tuple();
-  BOOST_CHECK (os3.str() == std::string("()") );
-  os3 << set_open('[');
-  os3 << set_close(']');
-  os3 << make_tuple();
-  BOOST_CHECK (os3.str() == std::string("()[]") );
-  
-  // check width
-  useThisOStringStream os4;
-  os4 << std::setw(10) << make_tuple(1, 2, 3);
-  BOOST_CHECK (os4.str() == std::string("   (1 2 3)") );
-
-  std::ofstream tmp("temp.tmp");
+  ofstream tmp("temp.tmp");

 #if !defined (BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
  tmp << make_tuple("One", "Two", 3);
 #endif   
  tmp << set_delimiter(':');
-  tmp << make_tuple(1000, 2000, 3000) << std::endl;
+  tmp << make_tuple(1000, 2000, 3000) << endl;

  tmp.close();
  
  // When teading tuples from a stream, manipulators must be set correctly:
-  std::ifstream tmp3("temp.tmp");
-  tuple<std::string, std::string, int> j;
+  ifstream tmp3("temp.tmp");
+  tuple<string, string, int> j;

 #if !defined (BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
  tmp3 >> j; 
@ -112,26 +98,12 @@ int test_main(int argc, char * argv[] ) {


  // reading tuple<int, int, int> in format (a b c); 
-  useThisIStringStream is1("(100 200 300)"); 
+  useThisIStringStream is("(100 200 300)"); 
   
-  tuple<int, int, int> ti1; 
-  BOOST_CHECK(bool(is1 >> ti1));
-  BOOST_CHECK(ti1 == make_tuple(100, 200, 300));
-
-  useThisIStringStream is2("()");
-  tuple<> ti2;
-  BOOST_CHECK(bool(is2 >> ti2));
-  useThisIStringStream is3("[]");
-  is3 >> set_open('[');
-  is3 >> set_close(']');
-  BOOST_CHECK(bool(is3 >> ti2));
-
-  // Make sure that whitespace between elements
-  // is skipped.
-  useThisIStringStream is4("(100 200 300)"); 
+  tuple<int, int, int> ti; 
+  BOOST_CHECK(bool(is >> ti));
+  BOOST_CHECK(ti == make_tuple(100, 200, 300));
   
-  BOOST_CHECK(bool(is4 >> std::noskipws >> ti1));
-  BOOST_CHECK(ti1 == make_tuple(100, 200, 300));

  // Note that strings are problematic:
  // writing a tuple on a stream and reading it back doesn't work in
--- a/test/tuple_test_bench.cpp
+++ b/test/tuple_test_bench.cpp
@ -1,4 +1,4 @@
-// Copyright (C) 1999, 2000 Jaakko Jarvi (jaakko.jarvi@cs.utu.fi)
+// Copyright (C) 1999, 2000 Jaakko J<EFBFBD>rvi (jaakko.jarvi@cs.utu.fi)
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@ -21,6 +21,7 @@
 #include <string>
 #include <utility>

+using namespace std;
 using namespace boost;

 // ----------------------------------------------------------------------------
@ -273,7 +274,7 @@ make_tuple_test()
  BOOST_CHECK(get<1>(t1) == 'a');

  tuple<int, std::string> t2;
-  t2 = boost::make_tuple((short int)2, std::string("Hi"));
+  t2 = make_tuple((short int)2, std::string("Hi"));
  BOOST_CHECK(get<0>(t2) == 2);
  BOOST_CHECK(get<1>(t2) == "Hi");

@ -445,26 +446,6 @@ void tuple_length_test()

 }

-// ----------------------------------------------------------------------------
-// - testing swap -----------------------------------------------------------
-// ----------------------------------------------------------------------------
-void tuple_swap_test()
-{
-  tuple<int, float, double> t1(1, 2.0f, 3.0), t2(4, 5.0f, 6.0);
-  swap(t1, t2);
-  BOOST_CHECK(get<0>(t1) == 4);
-  BOOST_CHECK(get<1>(t1) == 5.0f);
-  BOOST_CHECK(get<2>(t1) == 6.0);
-  BOOST_CHECK(get<0>(t2) == 1);
-  BOOST_CHECK(get<1>(t2) == 2.0f);
-  BOOST_CHECK(get<2>(t2) == 3.0);
-
-  int i = 1,j = 2;
-  boost::tuple<int&> t3(i), t4(j);
-  swap(t3, t4);
-  BOOST_CHECK(i == 2);
-  BOOST_CHECK(j == 1);
-}



@ -485,7 +466,6 @@ int test_main(int, char *[]) {
  cons_test();
  const_tuple_test();
  tuple_length_test();
-  tuple_swap_test();
  return 0;
 }