From f6418b0efa79078c206dc7d77bc4cad1bb03629b Mon Sep 17 00:00:00 2001
From: nobody <nobody@localhost>
Date: Tue, 21 Mar 2006 02:26:31 +0000
Subject: [PATCH 001/111] This commit was manufactured by cvs2svn to create
 branch 'RC_1_34_0'.

[SVN r33417]

From 1463eace1d35d9d688c9ceabd1e8c0a6a2017439 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 28 Mar 2006 17:05:43 +0000
Subject: [PATCH 002/111] Merge hash documentation changes to release branch.

[SVN r33509]
---
 hash/doc/ref.xml      | 368 ++++++++++++++++--------------------------
 hash/doc/tutorial.qbk |   2 +-
 2 files changed, 144 insertions(+), 226 deletions(-)

diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index 0318440..71d17a0 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -68,7 +68,7 @@
           </parameter>
           <returns>
             <para>Unspecified in TR1, except that equal arguments yield the same result.</para>
-            <para><functionname alt="boost::hash_value(bool)">hash_value</functionname>(val) in Boost.</para>
+            <para><functionname>hash_value</functionname>(val) in Boost.</para>
           </returns>
           <throws><para>Doesn't throw</para></throws>
         </method>
@@ -266,7 +266,7 @@
           </parameter>
           <returns>
             <para>Unspecified in TR1, except that equal arguments yield the same result.</para>
-            <para><functionname alt="boost::hash_value(float)">hash_value</functionname>(val) in Boost.</para>
+            <para><functionname>hash_value</functionname>(val) in Boost.</para>
           </returns>
           <throws><para>Doesn't throw</para></throws>
         </method>
@@ -354,7 +354,7 @@
         </template>
         <type>void</type>
         <parameter name="seed"><paramtype>size_t &amp;</paramtype></parameter>
-        <parameter name="v"><paramtype>T const &amp;</paramtype></parameter>
+        <parameter name="v"><paramtype>T const&amp;</paramtype></parameter>
         <purpose>
             Called repeatedly to incrementally create a hash value from
             several variables.
@@ -444,21 +444,9 @@ for(; first != last; ++first)
 
       <overloaded-function name="hash_value">
         <purpose>
-            Implementation of a hash function for integers.
+            Implementation of the hash function.
         </purpose>
 
-        <description><para>
-          Generally shouldn't be called directly by users, instead they should use
-          <classname>boost::hash</classname>, <functionname>boost::hash_range</functionname>
-          or <functionname>boost::hash_combine</functionname> which
-          call hash_value without namespace qualification so that overloads
-          for custom types are found via ADL.
-        </para></description>
-        <notes>
-          <para>Overloads for other types supplied in other headers.</para>
-          <para>This is an extension to TR1</para>
-        </notes>
-
         <signature>
           <type>std::size_t</type>
           <parameter name="val"><paramtype>int</paramtype></parameter>
@@ -479,32 +467,6 @@ for(; first != last; ++first)
           <parameter name="val"><paramtype>unsigned long</paramtype></parameter>
         </signature>
 
-        <returns>
-          <code>val</code>
-        </returns>
-      </overloaded-function>
-
-      <!--
-        boost::hash_value - floating point
-        -->
-
-      <overloaded-function name="hash_value">
-        <purpose>
-            Implementation of a hash function for floating point values.
-        </purpose>
-
-        <description><para>
-          Generally shouldn't be called directly by users, instead they should use
-          <classname>boost::hash</classname>, <functionname>boost::hash_range</functionname>
-          or <functionname>boost::hash_combine</functionname> which
-          call hash_value without namespace qualification so that overloads
-          for custom types are found via ADL.
-        </para></description>
-        <notes>
-          <para>Overloads for other types supplied in other headers.</para>
-          <para>This is an extension to TR1</para>
-        </notes>
-
         <signature>
           <type>std::size_t</type>
           <parameter name="val"><paramtype>float</paramtype></parameter>
@@ -520,70 +482,12 @@ for(; first != last; ++first)
           <parameter name="val"><paramtype>long double</paramtype></parameter>
         </signature>
 
-        <returns>
-          <para>
-            An unspecified value, except that equal arguments shall yield the same
-            result
-          </para>
-        </returns>
-      </overloaded-function>
-
-      <!--
-        boost::hash_value - pointers
-        -->
-
-      <overloaded-function name="hash_value">
-        <purpose>
-            Implementation of a hash function for pointers.
-        </purpose>
-
-        <description><para>
-          Generally shouldn't be called directly by users, instead they should use
-          <classname>boost::hash</classname>, <functionname>boost::hash_range</functionname>
-          or <functionname>boost::hash_combine</functionname> which
-          call hash_value without namespace qualification so that overloads
-          for custom types are found via ADL.
-        </para></description>
-        <notes>
-          <para>Overloads for other types supplied in other headers.</para>
-          <para>This is an extension to TR1</para>
-        </notes>
-
         <signature>
           <template><template-type-parameter name="T"/></template>
           <type>std::size_t</type>
           <parameter name="val"><paramtype>T* const&amp;</paramtype></parameter>
         </signature>
 
-        <returns>
-          <para>
-            An unspecified value, except that equal arguments shall yield the same
-            result
-          </para>
-        </returns>
-      </overloaded-function>
-
-      <!--
-        boost::hash_value - arrays
-        -->
-
-      <overloaded-function name="hash_value">
-        <purpose>
-            Implementation of a hash function for built in arrays.
-        </purpose>
-
-        <description><para>
-          Generally shouldn't be called directly by users, instead they should use
-          <classname>boost::hash</classname>, <functionname>boost::hash_range</functionname>
-          or <functionname>boost::hash_combine</functionname> which
-          call hash_value without namespace qualification so that overloads
-          for custom types are found via ADL.
-        </para></description>
-        <notes>
-          <para>Overloads for other types supplied in other headers.</para>
-          <para>This is an extension to TR1</para>
-        </notes>
-        
         <signature>
           <template>
             <template-type-parameter name="T"/>
@@ -602,30 +506,6 @@ for(; first != last; ++first)
           <parameter><paramtype>const T (&amp;val)[N]</paramtype></parameter>
         </signature>
 
-        <returns><code>hash_range(val, val+N)</code></returns>
-      </overloaded-function>
-
-      <!--
-        boost::hash_value - string
-        -->
-
-      <overloaded-function name="hash_value">
-        <purpose>
-            Implementation of a hash function for <code>std::basic_string</code>.
-        </purpose>
-
-        <description><para>
-          Generally shouldn't be called directly by users, instead they should use
-          <classname>boost::hash</classname>, <functionname>boost::hash_range</functionname>
-          or <functionname>boost::hash_combine</functionname> which
-          call hash_value without namespace qualification so that overloads
-          for custom types are found via ADL.
-        </para></description>
-        <notes>
-          <para>Overloads for other types supplied in other headers.</para>
-          <para>This is an extension to TR1</para>
-        </notes>
-
         <signature>
           <template>
             <template-type-parameter name="Ch"/>
@@ -636,118 +516,156 @@ for(; first != last; ++first)
               <paramtype>std::basic_string&lt;Ch, std::char_traits&lt;Ch&gt;, A&gt; const&amp;</paramtype>
           </parameter>
         </signature>
-
-        <returns><code>hash_range(val.begin(), val.end())</code></returns>
-      </overloaded-function>
-
-      <!--
-        boost::hash_value - pairs
-        -->
-
-      <overloaded-function name="hash_value">
-        <signature>
+              
+       <signature>
           <template>
             <template-type-parameter name="A"/>
             <template-type-parameter name="B"/>
           </template>
           <type>std::size_t</type>
-          <parameter name="val"><paramtype>std::pair&lt;A, B&gt; const &amp;</paramtype></parameter>
+          <parameter name="val"><paramtype>std::pair&lt;A, B&gt; const&amp;</paramtype></parameter>
         </signature>
-        <effects><programlisting>
-size_t seed = 0;
-<functionname>hash_combine</functionname>(seed, val.first);
-<functionname>hash_combine</functionname>(seed, val.second);
-return seed;
-        </programlisting></effects>
+
+        <signature>
+          <template>
+            <template-type-parameter name="T"/>
+            <template-type-parameter name="A"/>
+          </template>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::vector&lt;T, A&gt; const&amp;</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <template>
+            <template-type-parameter name="T"/>
+            <template-type-parameter name="A"/>
+          </template>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::list&lt;T, A&gt; const&amp;</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <template>
+            <template-type-parameter name="T"/>
+            <template-type-parameter name="A"/>
+          </template>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::deque&lt;T, A&gt; const&amp;</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <template>
+            <template-type-parameter name="K"/>
+            <template-type-parameter name="C"/>
+            <template-type-parameter name="A"/>
+          </template>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::set&lt;K, C, A&gt; const&amp;</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <template>
+            <template-type-parameter name="K"/>
+            <template-type-parameter name="C"/>
+            <template-type-parameter name="A"/>
+          </template>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::multiset&lt;K, C, A&gt; const&amp;</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <template>
+            <template-type-parameter name="K"/>
+            <template-type-parameter name="T"/>
+            <template-type-parameter name="C"/>
+            <template-type-parameter name="A"/>
+          </template>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::map&lt;K, T, C, A&gt; const&amp;</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <template>
+            <template-type-parameter name="K"/>
+            <template-type-parameter name="T"/>
+            <template-type-parameter name="C"/>
+            <template-type-parameter name="A"/>
+          </template>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::multimap&lt;K, T, C, A&gt; const&amp;</paramtype></parameter>
+        </signature>
+
+        <description><para>
+          Generally shouldn't be called directly by users, instead they should use
+          <classname>boost::hash</classname>, <functionname>boost::hash_range</functionname>
+          or <functionname>boost::hash_combine</functionname> which
+          call <code>hash_value</code> without namespace qualification so that overloads
+          for custom types are found via ADL.
+        </para></description>
+
+        <notes>
+          <para>This is an extension to TR1</para>
+        </notes>
+
         <throws>
-          Only throws if <code><functionname>hash_value</functionname>(A)</code>
-          or <code><functionname>hash_value</functionname>(B)</code> throws.
+            Only throws if a user supplied version of
+            <code><functionname>hash_value</functionname></code>
+            throws for an element of a container, or
+            one of the types stored in a pair.
         </throws>
-        <notes><para>This is an extension to TR1</para></notes>
-      </overloaded-function>
-
-      <!--
-        boost::hash_value - containers
-        -->
-
-      <overloaded-function name="hash_value">
-        <signature>
-          <template>
-            <template-type-parameter name="T"/>
-            <template-type-parameter name="A"/>
-          </template>
-          <type>std::size_t</type>
-          <parameter name="val"><paramtype>std::vector&lt;T, A&gt; const &amp;</paramtype></parameter>
-        </signature>
-
-        <signature>
-          <template>
-            <template-type-parameter name="T"/>
-            <template-type-parameter name="A"/>
-          </template>
-          <type>std::size_t</type>
-          <parameter name="val"><paramtype>std::list&lt;T, A&gt; const &amp;</paramtype></parameter>
-        </signature>
-
-        <signature>
-          <template>
-            <template-type-parameter name="T"/>
-            <template-type-parameter name="A"/>
-          </template>
-          <type>std::size_t</type>
-          <parameter name="val"><paramtype>std::deque&lt;T, A&gt; const &amp;</paramtype></parameter>
-        </signature>
-
-        <signature>
-          <template>
-            <template-type-parameter name="K"/>
-            <template-type-parameter name="C"/>
-            <template-type-parameter name="A"/>
-          </template>
-          <type>std::size_t</type>
-          <parameter name="val"><paramtype>std::set&lt;K, C, A&gt; const &amp;</paramtype></parameter>
-        </signature>
-
-        <signature>
-          <template>
-            <template-type-parameter name="K"/>
-            <template-type-parameter name="C"/>
-            <template-type-parameter name="A"/>
-          </template>
-          <type>std::size_t</type>
-          <parameter name="val"><paramtype>std::multiset&lt;K, C, A&gt; const &amp;</paramtype></parameter>
-        </signature>
-
-        <signature>
-          <template>
-            <template-type-parameter name="K"/>
-            <template-type-parameter name="T"/>
-            <template-type-parameter name="C"/>
-            <template-type-parameter name="A"/>
-          </template>
-          <type>std::size_t</type>
-          <parameter name="val"><paramtype>std::map&lt;K, T, C, A&gt; const &amp;</paramtype></parameter>
-        </signature>
-
-        <signature>
-          <template>
-            <template-type-parameter name="K"/>
-            <template-type-parameter name="T"/>
-            <template-type-parameter name="C"/>
-            <template-type-parameter name="A"/>
-          </template>
-          <type>std::size_t</type>
-          <parameter name="val"><paramtype>std::multimap&lt;K, T, C, A&gt; const &amp;</paramtype></parameter>
-        </signature>
 
         <returns>
-          <code><functionname>hash_range</functionname>(val.begin(), val.end());</code>
+          <informaltable>
+            <tgroup cols="2">
+              <thead>
+                <row>
+                  <entry>Types</entry>
+                  <entry>Returns</entry>
+                </row>
+              </thead>
+              <tbody>
+                <row>
+                  <entry><code>int</code></entry>
+                  <entry morerows="3"><code>val</code></entry>
+                </row>
+                <row><entry><code>unsigned int</code></entry></row>
+                <row><entry><code>long</code></entry></row>
+                <row><entry><code>unsigned long</code></entry></row>
+                <row>
+                  <entry><code>float</code></entry>
+                  <entry morerows="3">An unspecified value, except that equal arguments shall yield the same result.</entry>
+                </row>
+                <row><entry><code>double</code></entry></row>
+                <row><entry><code>long double</code></entry></row>
+                <row><entry><code>T*</code></entry></row>
+                <row>
+                    <entry><code>T (&amp;val)[N]</code></entry>
+                    <entry morerows="1"><code>hash_range(val, val+N)</code></entry>
+                </row>
+                <row><entry><code>const T (&amp;val)[N]</code></entry></row>
+                <row>
+                  <entry><code>std:basic&lt;Ch, std::char_traits&lt;Ch&gt;, A&gt; const&amp;</code></entry>
+                  <entry morerows="7"><code>hash_range(val, val+N)</code></entry>
+                </row>
+                <row><entry><code>std::vector&lt;T, A&gt; const&amp;</code></entry></row>
+                <row><entry><code>std::list&lt;T, A&gt; const&amp;</code></entry></row>
+                <row><entry><code>std::deque&lt;T, A&gt; const&amp;</code></entry></row>
+                <row><entry><code>std::set&lt;K, C, A&gt; const&amp;</code></entry></row>
+                <row><entry><code>std::multiset&lt;K, C, A&gt; const&amp;</code></entry></row>
+                <row><entry><code>std::map&lt;K, T, C, A&gt; const&amp;</code></entry></row>
+                <row><entry><code>std::multimap&lt;K, T, C, A&gt; const&amp;</code></entry></row>
+                <row>
+                  <entry><code>std::pair&lt;A, B&gt; const&amp;</code></entry>
+                  <entry><programlisting>size_t seed = 0;
+<functionname>hash_combine</functionname>(seed, val.first);
+<functionname>hash_combine</functionname>(seed, val.second);
+return seed;</programlisting></entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable>
         </returns>
-        <throws>
-          Only throws if <code><functionname>hash_value</functionname>(T)</code> throws.
-        </throws>
-        <notes><para>This is an extension to TR1</para></notes>
-      </overloaded-function>      
+      </overloaded-function>
     </namespace>
   </header>
 </library-reference>
diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index 762c275..d68fe6e 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -12,7 +12,7 @@ If your standard library supplies its own implementation of the unordered
 associative containers and you wish to use
 [classref boost::hash], just use an extra template parameter:
 
-    std::unordered_multiset<std::vector<int>, ``[classref boost::hash]``<int> >
+    std::unordered_multiset<int, ``[classref boost::hash]``<int> >
             set_of_ints;
 
     std::unordered_set<std::pair<int, int>, ``[classref boost::hash]``<std::pair<int, int> >

From c030b74a4d475eb69051846a08a5383dd2af6dfb Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 6 Apr 2006 19:55:06 +0000
Subject: [PATCH 003/111] Rearrange the results table in the hash_value docs.
 Hopefully this will be clearer.

[SVN r33568]
---
 hash/doc/ref.xml | 48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index 71d17a0..0dd632d 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -625,37 +625,39 @@ for(; first != last; ++first)
               </thead>
               <tbody>
                 <row>
-                  <entry><code>int</code></entry>
-                  <entry morerows="3"><code>val</code></entry>
+                  <entry><code>int</code>, <code>unsigned int</code>, <code>long</code>, <code>unsigned long</code></entry>
+                  <entry><code>val</code></entry>
                 </row>
-                <row><entry><code>unsigned int</code></entry></row>
-                <row><entry><code>long</code></entry></row>
-                <row><entry><code>unsigned long</code></entry></row>
                 <row>
-                  <entry><code>float</code></entry>
-                  <entry morerows="3">An unspecified value, except that equal arguments shall yield the same result.</entry>
+                  <entry><code>float</code>, <code>double</code>, <code>long double</code></entry>
+                  <entry>An unspecified value, except that equal arguments shall yield the same result.</entry>
                 </row>
-                <row><entry><code>double</code></entry></row>
-                <row><entry><code>long double</code></entry></row>
-                <row><entry><code>T*</code></entry></row>
                 <row>
-                    <entry><code>T (&amp;val)[N]</code></entry>
-                    <entry morerows="1"><code>hash_range(val, val+N)</code></entry>
+                  <entry><code>T*</code></entry>
+                  <entry>An unspecified value, except that equal arguments shall yield the same result.</entry>
                 </row>
-                <row><entry><code>const T (&amp;val)[N]</code></entry></row>
                 <row>
-                  <entry><code>std:basic&lt;Ch, std::char_traits&lt;Ch&gt;, A&gt; const&amp;</code></entry>
-                  <entry morerows="7"><code>hash_range(val, val+N)</code></entry>
+                  <entry>
+                    <code>T&#160;val[N]</code>,
+                    <code>const&#160;T&#160;val[N]</code>
+                  </entry>
+                  <entry><code>hash_range(val, val+N)</code></entry>
                 </row>
-                <row><entry><code>std::vector&lt;T, A&gt; const&amp;</code></entry></row>
-                <row><entry><code>std::list&lt;T, A&gt; const&amp;</code></entry></row>
-                <row><entry><code>std::deque&lt;T, A&gt; const&amp;</code></entry></row>
-                <row><entry><code>std::set&lt;K, C, A&gt; const&amp;</code></entry></row>
-                <row><entry><code>std::multiset&lt;K, C, A&gt; const&amp;</code></entry></row>
-                <row><entry><code>std::map&lt;K, T, C, A&gt; const&amp;</code></entry></row>
-                <row><entry><code>std::multimap&lt;K, T, C, A&gt; const&amp;</code></entry></row>
                 <row>
-                  <entry><code>std::pair&lt;A, B&gt; const&amp;</code></entry>
+                  <entry>
+                    <code>std:basic_string&lt;Ch,&#160;std::char_traits&lt;Ch&gt;,&#160;A&gt;</code>,
+                    <code>std::vector&lt;T,&#160;A&gt;</code>,
+                    <code>std::list&lt;T,&#160;A&gt;</code>,
+                    <code>std::deque&lt;T,&#160;A&gt;</code>,
+                    <code>std::set&lt;K,&#160;C,&#160;A&gt;</code>,
+                    <code>std::multiset&lt;K,&#160;C,&#160;A&gt;</code>,
+                    <code>std::map&lt;K,&#160;T,&#160;C,&#160;A&gt;</code>,
+                    <code>std::multimap&lt;K,&#160;T,&#160;C,&#160;A&gt;</code>
+                  </entry>
+                  <entry><code>hash_range(val.begin(), val.end())</code></entry>
+                </row>
+                <row>
+                  <entry><code>std::pair&lt;A, B&gt;</code></entry>
                   <entry><programlisting>size_t seed = 0;
 <functionname>hash_combine</functionname>(seed, val.first);
 <functionname>hash_combine</functionname>(seed, val.second);

From 939bba607a575a03d5e3776867cf91314b9398a2 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 9 Apr 2006 12:14:23 +0000
Subject: [PATCH 004/111] Merge hash documentation changes to release branch.

[SVN r33612]
---
 hash/doc/intro.qbk | 19 +++++++++++--------
 hash/doc/ref.xml   |  6 +++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/hash/doc/intro.qbk b/hash/doc/intro.qbk
index 6e11647..bb4e998 100644
--- a/hash/doc/intro.qbk
+++ b/hash/doc/intro.qbk
@@ -1,23 +1,26 @@
 [section:intro Introduction]
 
-[def __tr1__ [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1745.pdf
-    C++ Standard Library Technical Report]]
-[def __tr1-short__ [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1745.pdf
-    Technical Report]]
+[def __tr1-full__
+    [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf
+    Draft Technical Report on C++ Library Extensions]]
+[def __tr1__
+    [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf
+    TR1]]
 [def __multi-index__ [@../../libs/multi_index/doc/index.html
     Boost Multi-Index Containers Library]]
 [def __multi-index-short__ [@../../libs/multi_index/doc/index.html
     Boost.MultiIndex]]
-[def __issues__ [@http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
+[def __issues__
+    [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1837.pdf
     Library Extension Technical Report Issues List]]
 [def __hash-function__ [@http://en.wikipedia.org/wiki/Hash_function hash function]]
 [def __hash-table__ [@http://en.wikipedia.org/wiki/Hash_table hash table]]
 
 [classref boost::hash] is an implementation of the __hash-function__ object
-specified by the __tr1-short__. It is intended for use as the default hash function
+specified by the __tr1-full__ (TR1). It is intended for use as the default hash function
 for unordered associative containers, and the __multi-index__'s hash indexes.
 
-As it is compliant with the __tr1-short__, it will work with:
+As it is compliant with __tr1__, it will work with:
 
 * integers
 * floats
@@ -25,7 +28,7 @@ As it is compliant with the __tr1-short__, it will work with:
 * strings
 
 It also implements the extension proposed by Peter Dimov in issue 6.18 of the
-__issues__, this adds support for:
+__issues__ (page 63), this adds support for:
 
 * arrays
 * `std::pair`
diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index 0dd632d..3af0e8e 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -1,9 +1,9 @@
 <library-reference>
   <section id="hash.reference.specification">
     <para>For the full specification, see section 6.3 of the
-        <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1745.pdf">C++ Standard Library Technical Report</ulink>
+        <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf">C++ Standard Library Technical Report</ulink>
         and issue 6.18 of the
-        <ulink url="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf">Library Extension Technical Report Issues List</ulink>.
+        <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1837.pdf">Library Extension Technical Report Issues List</ulink> (page 63).
     </para>
   </section>
   <header name="boost/functional/hash.hpp">
@@ -27,7 +27,7 @@
           <classname>std::unary_function&lt;T, std::size_t&gt;</classname>
         </inherit>
 
-        <purpose>An STL compliant hash function object.</purpose>
+        <purpose>A <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf">TR1</ulink> compliant hash function object.</purpose>
 
         <method name="operator()" cv="const">
           <type>std::size_t</type>

From bda8f4845d73e241718b91afaecbc1b25b32512e Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 3 May 2006 18:34:43 +0000
Subject: [PATCH 005/111] Merge OS X hash float fix from head to rc_1_34_0.

[SVN r33917]
---
 include/boost/functional/detail/hash_float.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/boost/functional/detail/hash_float.hpp b/include/boost/functional/detail/hash_float.hpp
index cb63935..07d19c3 100644
--- a/include/boost/functional/detail/hash_float.hpp
+++ b/include/boost/functional/detail/hash_float.hpp
@@ -23,7 +23,8 @@
 #if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
 #  if defined(__GLIBCPP__) || defined(__GLIBCXX__)
 // GNU libstdc++ 3
-#    if defined(__USE_ISOC99) || defined(_GLIBCXX_USE_C99_MATH)
+#    if (defined(__USE_ISOC99) || defined(_GLIBCXX_USE_C99_MATH)) && \
+        !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__))
 #      define BOOST_HASH_USE_FPCLASSIFY
 #    endif
 #  elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)

From 0785097bacac46a1c3d48753f654dbf3bca9a508 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 20 May 2006 07:34:48 +0000
Subject: [PATCH 006/111] Merge hash workarounds for Digital Mars to the
 release branch.

[SVN r34036]
---
 .../functional/detail/float_functions.hpp     |  2 +-
 include/boost/functional/hash/hash.hpp        | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/include/boost/functional/detail/float_functions.hpp b/include/boost/functional/detail/float_functions.hpp
index c5fc94a..34b8251 100644
--- a/include/boost/functional/detail/float_functions.hpp
+++ b/include/boost/functional/detail/float_functions.hpp
@@ -25,7 +25,7 @@
 
 // STLport:
 #if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
-#  if defined(__GNUC__) && __GNUC__ < 3 && (defined(linux) || defined(__linux) || defined(__linux__))
+#  if (defined(__GNUC__) && __GNUC__ < 3 && (defined(linux) || defined(__linux) || defined(__linux__))) || defined(__DMC__)
 #    define BOOST_HASH_USE_C99_FLOAT_FUNCS
 #  elif defined(BOOST_MSVC) && BOOST_MSVC < 1300
 #    define BOOST_HASH_USE_C99_FLOAT_FUNCS
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index b278c9b..c7189c5 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -41,7 +41,11 @@ namespace boost
     std::size_t hash_value(long);
     std::size_t hash_value(unsigned long);
 
+#if !BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x847))
     template <class T> std::size_t hash_value(T* const&);
+#else
+    template <class T> std::size_t hash_value(T*);
+#endif
 
 #if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
     template< class T, unsigned N >
@@ -105,7 +109,11 @@ namespace boost
     }
 
     // Implementation by Alberto Barbati and Dave Harris.
+#if !BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x847))
     template <class T> std::size_t hash_value(T* const& v)
+#else
+    template <class T> std::size_t hash_value(T* v)
+#endif
     {
         std::size_t x = static_cast<std::size_t>(
            reinterpret_cast<std::ptrdiff_t>(v));
@@ -460,6 +468,17 @@ namespace boost
 #endif
     };
 
+#if BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x847))
+    template <class T, unsigned int n> struct hash<T[n]>
+        : std::unary_function<T[n], std::size_t>
+    {
+        std::size_t operator()(const T* val) const
+        {
+            return boost::hash_range(val, val+n);
+        }
+    };
+#endif
+
 #elif !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
 
     // On compilers without partial specialization, boost::hash<T>

From 1b625ac7abf787546a4f0e9bcf6f6ca2cb5a78b6 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 6 Jun 2006 17:38:38 +0000
Subject: [PATCH 007/111] Merge VC7 workaround from HEAD.

[SVN r34197]
---
 include/boost/functional/hash/hash.hpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index c7189c5..c1d463e 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -388,7 +388,7 @@ namespace boost
     }
 
     template <class T> struct hash
-        : public hash_detail::hash_impl<boost::is_pointer<T>::value>
+        : public boost::hash_detail::hash_impl<boost::is_pointer<T>::value>
             ::BOOST_NESTED_TEMPLATE inner<T>
     {
     };
@@ -479,7 +479,7 @@ namespace boost
     };
 #endif
 
-#elif !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
     // On compilers without partial specialization, boost::hash<T>
     // has already been declared to deal with pointers, so just
@@ -487,6 +487,11 @@ namespace boost
 
     namespace hash_detail
     {
+        template <bool IsPointer>
+        struct hash_impl;
+
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+
         template <>
         struct hash_impl<false>
         {
@@ -507,15 +512,12 @@ namespace boost
 #endif
             };
         };
-    }
 
 #else // Visual C++ 6.5
 
     // There's probably a more elegant way to Visual C++ 6.5 to work
     // but I don't know what it is.
 
-    namespace hash_detail
-    {
         template <bool IsConst>
         struct hash_impl_msvc
         {
@@ -560,8 +562,10 @@ namespace boost
             template <class T>
             struct inner : public hash_impl_msvc2<T> {};
         };
+
+#endif // Visual C++ 6.5
     }
-#endif
+#endif  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 }
 
 #endif

From a302ecffab25b1937a0be04d532aa6cca9bccc2b Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 8 Jun 2006 22:12:16 +0000
Subject: [PATCH 008/111] Get hashing std::size_t working on 64-bit Visual C++.

[SVN r34253]
---
 include/boost/functional/hash/hash.hpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index c1d463e..dbff12b 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -41,6 +41,14 @@ namespace boost
     std::size_t hash_value(long);
     std::size_t hash_value(unsigned long);
 
+#if defined(BOOST_MSVC) && defined(_WIN64)
+    // On 64-bit windows std::size_t is a typedef for unsigned long long, which
+    // isn't due to be supported until Boost 1.35. So add support here.
+    // (Technically, Boost.Hash isn't actually documented as supporting
+    // std::size_t. But it would be pretty silly not to).
+    std::size_t hash_value(std::size_t);
+#endif
+
 #if !BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x847))
     template <class T> std::size_t hash_value(T* const&);
 #else
@@ -108,6 +116,13 @@ namespace boost
         return static_cast<std::size_t>(v);
     }
 
+#if defined(BOOST_MSVC) && defined(_WIN64)
+    inline std::size_t hash_value(std::size_t v)
+    {
+        return v;
+    }
+#endif
+
     // Implementation by Alberto Barbati and Dave Harris.
 #if !BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x847))
     template <class T> std::size_t hash_value(T* const& v)

From c1fd57beaaefe3ea47f94dc835e37faaf368688d Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 11 Jun 2006 14:31:51 +0000
Subject: [PATCH 009/111] Update the hash library acknowledgements.

[SVN r34271]
---
 hash/doc/thanks.qbk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/hash/doc/thanks.qbk b/hash/doc/thanks.qbk
index aa37aa7..5dc20e5 100644
--- a/hash/doc/thanks.qbk
+++ b/hash/doc/thanks.qbk
@@ -1,14 +1,15 @@
 [section:acknowledgements Acknowledgements]
 
-This library is based on the design by Peter Dimov. During the initial
-development
-Joaquín M López Muñoz made many useful suggestions and contributed fixes.
+This library is based on the design by Peter Dimov's original design.
+
+During the initial development Joaquín M López Muñoz made many useful
+suggestions, contributed fixes.
 
 The formal review was managed by Thorsten Ottosen, and the library reviewed by:
 David Abrahams, Alberto Barbati, Topher Cooper, Caleb Epstein, Dave Harris,
-Chris Jefferson, Bronek Kozicki, John Maddock, Tobias Swinger, Jaap Suter,
-Rob Stewart and Pavel Vozenilek. Since then, further constructive criticism has
-been made by Daniel Krügler, Alexander Nasonov and 沈慧峰.
+Chris Jefferson, Bronek Kozicki, John Maddock, Tobias Swinger, Jaap Suter, Rob
+Stewart and Pavel Vozenilek. Since then, there have been further contributions
+from Daniel Krügler, Alexander Nasonov, 沈慧峰 and John Maddock.
 
 The implementation of the hash function for pointers is based on suggestions
 made by Alberto Barbati and Dave Harris. Dave Harris also suggested an

From 63f3778db3182bf994e9c80736889e53813e0d3f Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 12 Jun 2006 17:58:12 +0000
Subject: [PATCH 010/111] Add support for long long on win64 as that's the only
 64-bit type on that platform (and std::size_t is 64 bit).

[SVN r34287]
---
 include/boost/functional/hash/hash.hpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index dbff12b..8a0d666 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -116,8 +116,13 @@ namespace boost
         return static_cast<std::size_t>(v);
     }
 
-#if defined(BOOST_MSVC) && defined(_WIN64)
-    inline std::size_t hash_value(std::size_t v)
+#if defined(_M_X64) && defined(_WIN64)
+    inline std::size_t hash_value(long long v)
+    {
+        return v;
+    }
+
+    inline std::size_t hash_value(unsigned long long v)
     {
         return v;
     }

From bb548f8100427b399b19fc9a09ba44f24131dbd4 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 13 Jul 2006 07:54:41 +0000
Subject: [PATCH 011/111] Update the Digital Mars workarounds for the latest
 version.

[SVN r34526]
---
 include/boost/functional/hash/hash.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 8a0d666..251f96d 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -49,7 +49,7 @@ namespace boost
     std::size_t hash_value(std::size_t);
 #endif
 
-#if !BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x847))
+#if !BOOST_WORKAROUND(__DMC__, <= 0x848)
     template <class T> std::size_t hash_value(T* const&);
 #else
     template <class T> std::size_t hash_value(T*);
@@ -129,7 +129,7 @@ namespace boost
 #endif
 
     // Implementation by Alberto Barbati and Dave Harris.
-#if !BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x847))
+#if !BOOST_WORKAROUND(__DMC__, <= 0x848)
     template <class T> std::size_t hash_value(T* const& v)
 #else
     template <class T> std::size_t hash_value(T* v)
@@ -488,7 +488,7 @@ namespace boost
 #endif
     };
 
-#if BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x847))
+#if BOOST_WORKAROUND(__DMC__, <= 0x848)
     template <class T, unsigned int n> struct hash<T[n]>
         : std::unary_function<T[n], std::size_t>
     {

From 3245b8efb33e33b7d63b5f6794fe8c48a4e76350 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 16 Jul 2006 07:13:50 +0000
Subject: [PATCH 012/111] Add copyright to the hash redirection page.

[SVN r34549]
---
 hash/index.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hash/index.html b/hash/index.html
index cddc779..b76ca08 100644
--- a/hash/index.html
+++ b/hash/index.html
@@ -1,3 +1,10 @@
+
+<!--
+Copyright 2005-2006 Daniel James.
+Distributed under 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)
+-->
+
 <html>
 <head>
     <meta http-equiv="refresh" content="0; URL=../../../doc/html/hash.html">

From ac65b9f32a41ddd3d839d7bdddf0d249931bc6e7 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 30 Jul 2006 20:42:11 +0000
Subject: [PATCH 013/111] Add a copyright comment to the hash reference
 documenation.

[SVN r34786]
---
 hash/doc/ref.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index 3af0e8e..f936ac4 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -1,3 +1,9 @@
+<!--
+Copyright 2005-2006 Daniel James.
+Distributed under 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)
+-->
+
 <library-reference>
   <section id="hash.reference.specification">
     <para>For the full specification, see section 6.3 of the

From 299a641c9fd1aa2181014e7d198ad54f0fe328ec Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 23 Sep 2006 14:53:07 +0000
Subject: [PATCH 014/111] Merge from head to RC_1_34_0.

[SVN r35289]
---
 hash/doc/changes.qbk     | 5 +++++
 hash/doc/disable.qbk     | 5 +++++
 hash/doc/intro.qbk       | 5 +++++
 hash/doc/links.qbk       | 5 +++++
 hash/doc/portability.qbk | 5 +++++
 hash/doc/thanks.qbk      | 5 +++++
 hash/doc/tutorial.qbk    | 5 +++++
 7 files changed, 35 insertions(+)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index fdb5b32..c8f8046 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -1,3 +1,8 @@
+
+[/ Copyright 2005-2006 Daniel James.
+ / Distributed under 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) ]
+
 [section:changes Change Log]
 
 [h2 Boost 1.33.0]
diff --git a/hash/doc/disable.qbk b/hash/doc/disable.qbk
index 609e4d5..62b4d31 100644
--- a/hash/doc/disable.qbk
+++ b/hash/doc/disable.qbk
@@ -1,3 +1,8 @@
+
+[/ Copyright 2005-2006 Daniel James.
+ / Distributed under 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) ]
+
 [section:disable Disabling The Extensions]
 
 While [classref boost::hash]'s extensions are generally useful, you might want
diff --git a/hash/doc/intro.qbk b/hash/doc/intro.qbk
index bb4e998..a4f3be3 100644
--- a/hash/doc/intro.qbk
+++ b/hash/doc/intro.qbk
@@ -1,3 +1,8 @@
+
+[/ Copyright 2005-2006 Daniel James.
+ / Distributed under 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) ]
+
 [section:intro Introduction]
 
 [def __tr1-full__
diff --git a/hash/doc/links.qbk b/hash/doc/links.qbk
index e5e5007..4217f5f 100644
--- a/hash/doc/links.qbk
+++ b/hash/doc/links.qbk
@@ -1,3 +1,8 @@
+
+[/ Copyright 2005-2006 Daniel James.
+ / Distributed under 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) ]
+
 [section:links Links]
 
 [*A Proposal to Add Hash Tables to the Standard Library]\n
diff --git a/hash/doc/portability.qbk b/hash/doc/portability.qbk
index 04cafc2..6c20799 100644
--- a/hash/doc/portability.qbk
+++ b/hash/doc/portability.qbk
@@ -1,3 +1,8 @@
+
+[/ Copyright 2005-2006 Daniel James.
+ / Distributed under 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) ]
+
 [section:portability Portability]
 
 [def __boost_hash__ [classref boost::hash]]
diff --git a/hash/doc/thanks.qbk b/hash/doc/thanks.qbk
index 5dc20e5..1b67c71 100644
--- a/hash/doc/thanks.qbk
+++ b/hash/doc/thanks.qbk
@@ -1,3 +1,8 @@
+
+[/ Copyright 2005-2006 Daniel James.
+ / Distributed under 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) ]
+
 [section:acknowledgements Acknowledgements]
 
 This library is based on the design by Peter Dimov's original design.
diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index d68fe6e..cf17c7a 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -1,3 +1,8 @@
+
+[/ Copyright 2005-2006 Daniel James.
+ / Distributed under 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) ]
+
 [def __multi-index-short__ [@../../libs/multi_index/doc/index.html
     Boost.MultiIndex]]
 

From a2202df1fe293890d9e350509c4eaf9387281a8d Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 6 Nov 2006 17:10:46 +0000
Subject: [PATCH 015/111] Remove obsolete Boost.Build v1 files.

[SVN r35880]
---
 hash/examples/Jamfile | 28 ------------------------
 hash/test/Jamfile     | 51 -------------------------------------------
 2 files changed, 79 deletions(-)
 delete mode 100644 hash/examples/Jamfile
 delete mode 100644 hash/test/Jamfile

diff --git a/hash/examples/Jamfile b/hash/examples/Jamfile
deleted file mode 100644
index 816ed85..0000000
--- a/hash/examples/Jamfile
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#  (C) Copyright Daniel James 2005.
-#  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)
-
-subproject libs/functional/hash/examples ;
-
-import testing ;
-
-DEPENDS all : test ;
-
-rule hash-example ( name )
-{
-    return [
-        run $(name).cpp
-        : : : <include>$(BOOST_ROOT)
-        ] ;
-}
-
-{
-    test-suite functional/examples
-        :
-            [ hash-example books ]
-            [ hash-example point ]
-            [ hash-example portable ]
-        ;
-}
diff --git a/hash/test/Jamfile b/hash/test/Jamfile
deleted file mode 100644
index fb57c00..0000000
--- a/hash/test/Jamfile
+++ /dev/null
@@ -1,51 +0,0 @@
-
-#  Copyright Daniel James 2005-2006. 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)
-
-subproject libs/functional/hash/test ;
-
-import testing ;
-
-DEPENDS all : test ;
-
-rule hash-test ( names + : extras * )
-{
-    return [
-        run $(names).cpp
-        : : : <include>$(BOOST_ROOT) $(extras)
-        : $(names[1])
-        ] ;
-}
-
-{
-    test-suite functional/hash
-        :
-            [ hash-test hash_fwd_test_1 ]
-            [ hash-test hash_fwd_test_2 ]
-            [ hash-test hash_number_test ]
-            [ hash-test hash_pointer_test ]
-            [ hash-test hash_function_pointer_test ]
-            [ hash-test hash_float_test : <test-info>always_show_run_output ]
-            [ hash-test hash_string_test ]
-            [ hash-test hash_range_test ]
-            [ hash-test hash_custom_test ]
-            [ hash-test hash_global_namespace_test ]
-            [ hash-test hash_friend_test ]
-            [ hash-test hash_built_in_array_test ]
-            [ hash-test hash_value_array_test ]
-            [ hash-test hash_vector_test ]
-            [ hash-test hash_list_test ]
-            [ hash-test hash_deque_test ]
-            [ hash-test hash_set_test ]
-            [ hash-test hash_map_test ]
-            [ hash-test link_test link_test_2 ]
-            [ hash-test link_ext_test link_no_ext_test ]
-            [ run container_fwd_test.cpp : : : <include>$(BOOST_ROOT) ]
-            [ compile-fail hash_no_ext_fail_test.cpp ]
-            [ run hash_no_ext_macro_1.cpp ]
-            [ run hash_no_ext_macro_2.cpp ]
-        ;
-}
-
-subinclude libs/functional/hash/examples ;

From d2b04d968cc15bc8e4309cc0ba847bb1eeb21de5 Mon Sep 17 00:00:00 2001
From: Andreas Huber <ahd6974-boostorg@live.com>
Date: Sat, 2 Dec 2006 14:17:26 +0000
Subject: [PATCH 016/111] Merged L & C issue fixes from trunk to branch.

[SVN r36246]
---
 binders.html                 | 181 +++++++++-------
 function_test.cpp            | 101 +++++++--
 function_traits.html         | 321 +++++++++++++++------------
 include/boost/functional.hpp |  16 +-
 index.html                   | 405 +++++++++++++++++++++--------------
 mem_fun.html                 | 260 ++++++++++++----------
 negators.html                | 208 ++++++++++--------
 ptr_fun.html                 | 195 +++++++++--------
 8 files changed, 990 insertions(+), 697 deletions(-)

diff --git a/binders.html b/binders.html
index b37bfa5..4220ed2 100644
--- a/binders.html
+++ b/binders.html
@@ -1,132 +1,161 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Boost Function Object Adapter Library</title>
+  <meta http-equiv="Content-Language" content="en-us">
+  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+
+  <title>Boost Function Object Adapter Library</title>
 </head>
 
 <body bgcolor="#FFFFFF" text="#000000">
+  <table border="1" bgcolor="#007F7F" cellpadding="2" summary="">
+    <tr>
+      <td bgcolor="#FFFFFF"><img src="../../boost.png" alt=
+      "boost.png (6897 bytes)" width="277" height="86"></td>
 
-<table border="1" bgcolor="#007F7F" cellpadding="2">
-  <tr>
-    <td bgcolor="#FFFFFF"><img src="../../boost.png" alt="boost.png (6897 bytes)" WIDTH="277" HEIGHT="86"></td>
-    <td><a href="../../index.htm"><font face="Arial" color="#FFFFFF"><big>Home </big></font></a></td>
-    <td><a href="../libraries.htm"><font face="Arial" color="#FFFFFF"><big>Libraries </big></font></a></td>
-    <td><a href="../../people/people.htm"><font face="Arial" color="#FFFFFF"><big>People </big></font></a></td>
-    <td><a href="../../more/faq.htm"><font face="Arial" color="#FFFFFF"><big>FAQ </big></font></a></td>
-    <td><a href="../../more/index.htm"><font face="Arial" color="#FFFFFF"><big>More </big></font></a></td>
-  </tr>
-</table>
+      <td><a href="../../index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Home</big></font></a></td>
 
-<h1>Binders</h1>
+      <td><a href="../libraries.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Libraries</big></font></a></td>
 
-<p>The header <nobr><a
-href="../../boost/functional.hpp">functional.hpp</a></nobr> provides
-enhanced versions of both the binder function object adapters from the
-C++ Standard Library <nobr>(&sect;20.3.6):</nobr></p>
+      <td><a href="../../people/people.htm"><font face="Arial" color=
+      "#FFFFFF"><big>People</big></font></a></td>
 
-<ul>
-<li><tt>binder1st</tt></li>
-<li><tt>binder2nd</tt></li>
-</ul>
+      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      "#FFFFFF"><big>FAQ</big></font></a></td>
 
-<p>As well as the corresponding helper functions</p>
+      <td><a href="../../more/index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>More</big></font></a></td>
+    </tr>
+  </table>
 
-<ul>
-<li><tt>bind1st</tt></li>
-<li><tt>bind2nd</tt></li>
-</ul>
+  <h1>Binders</h1>
 
-<p>The key benefit of these adapters over those in the Standard
-Library is they avoid the problem of <a href="#refref">references to
-references.</a>
+  <p>The header <a href="../../boost/functional.hpp">functional.hpp</a>
+  provides enhanced versions of both the binder function object adapters from
+  the C++ Standard Library (&sect;20.3.6):</p>
 
-<h3>Usage</h3>
+  <ul>
+    <li><tt>binder1st</tt></li>
 
-<p>Usage is identical to the standard binders.  For example,</p>
+    <li><tt>binder2nd</tt></li>
+  </ul>
 
-<blockquote><pre>
+  <p>As well as the corresponding helper functions</p>
+
+  <ul>
+    <li><tt>bind1st</tt></li>
+
+    <li><tt>bind2nd</tt></li>
+  </ul>
+
+  <p>The key benefit of these adapters over those in the Standard Library is
+  they avoid the problem of <a href="#refref">references to
+  references.</a></p>
+
+  <h3>Usage</h3>
+
+  <p>Usage is identical to the standard binders. For example,</p>
+
+  <blockquote>
+    <pre>
 class Foo {
 public:
-  void bar(std::ostream &);
+  void bar(std::ostream &amp;);
   // ...
 };
 // ...
 std::vector&lt;Foo&gt; c;
 // ...
 std::for_each(c.begin(), c.end(), 
-              boost::bind2nd(boost::mem_fun_ref(&Foo::bar), std::cout));
-</pre></blockquote>
+              boost::bind2nd(boost::mem_fun_ref(&amp;Foo::bar), std::cout));
+</pre>
+  </blockquote>
 
-<h3 id="refref">References to References</h3>
+  <h3 id="refref">References to References</h3>
 
-<p>Consider the usage example above</p>
+  <p>Consider the usage example above</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 class Foo {
 public:
-  void bar(<strong>std::ostream &</strong>);
+  void bar(<strong>std::ostream &amp;</strong>);
   // ...
 };
 // ...
 std::for_each(c.begin(), c.end(), 
-              boost::bind2nd(boost::mem_fun_ref(&Foo::bar), std::cout));
-</pre></blockquote>
+              boost::bind2nd(boost::mem_fun_ref(&amp;Foo::bar), std::cout));
+</pre>
+  </blockquote>
 
-<p>If this had been written using <tt><nobr>std::bind2nd</nobr></tt>
-and <tt><nobr>std::mem_fun_ref</nobr></tt>, it would be unlikely to
-compile.</p>
+  <p>If this had been written using <tt>std::bind2nd</tt> and
+  <tt>std::mem_fun_ref</tt>, it would be unlikely to compile.</p>
 
-<p>The problem arises because <tt><nobr>bar</nobr></tt> takes a
-reference argument.  The Standard defines
-<tt><nobr>std::mem_fun_ref</nobr></tt> such that it creates a function
-object whose <tt><nobr>second_argument_type</nobr></tt> will be
-<tt><nobr>std::ostream&</nobr></tt>.</p>
+  <p>The problem arises because <tt>bar</tt> takes a reference argument. The
+  Standard defines <tt>std::mem_fun_ref</tt> such that it creates a function
+  object whose <tt>second_argument_type</tt> will be
+  <tt>std::ostream&amp;</tt>.</p>
 
-<p>The call to <tt><nobr>bind2nd</nobr></tt> creates a
-<tt><nobr>binder2nd</nobr></tt> which the Standard defines as follows:
+  <p>The call to <tt>bind2nd</tt> creates a <tt>binder2nd</tt> which the
+  Standard defines as follows:</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 template &lt;class Operation&gt;
 class binder2nd
     : public unary_function&lt;typename Operation::first_argument_type,
                             typename Operation::result_type&gt; {
 ...
 public:
-  binder2nd(const Operation& x,
-            <strong>const typename Operation::second_argument_type& y</strong>);
+  binder2nd(const Operation&amp; x,
+            <strong>const typename Operation::second_argument_type&amp; y</strong>);
   ...
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>Since our operation's <tt><nobr>second_argument_type</nobr></tt> is
-<tt><nobr>std::ostream&</nobr></tt>, the type of <tt>y</tt> in the
-constructor would be <tt><nobr>std::ostream&&</nobr></tt>.  Since you
-cannot have a reference to a reference, at this point we should get a
-compilation error because references to references are illegal in C++
-(but see <a
-href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">
-C++ Standard core language active issues list</a>).</p>
+  <p>Since our operation's <tt>second_argument_type</tt> is
+  <tt>std::ostream&amp;</tt>, the type of <tt>y</tt> in the constructor would
+  be <tt>std::ostream&amp;&amp;</tt>. Since you cannot have a reference to a
+  reference, at this point we should get a compilation error because
+  references to references are illegal in C++ (but see <a href=
+  "http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
+  Standard core language active issues list</a>).</p>
 
-<p>The binders in this library avoid this problem by using the Boost
-<nobr><tt><a
-href="../utility/call_traits.htm">call_traits</a></tt></nobr> templates.</p>
+  <p>The binders in this library avoid this problem by using the Boost
+  <tt><a href="../utility/call_traits.htm">call_traits</a></tt>
+  templates.</p>
 
-<p>Our constructor is declared
+  <p>Our constructor is declared</p>
 
-<blockquote><pre>
-binder2nd(const Operation& x,
+  <blockquote>
+    <pre>
+binder2nd(const Operation&amp; x,
           <strong>typename call_traits&lt;
              typename binary_traits&lt;Operation&gt;::second_argument_type
           &gt;::param_type y</strong>)
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>As a result, <tt>y</tt> has a type of <tt><nobr>std::ostream&</nobr></tt>, 
-and our example compiles.</p>
+  <p>As a result, <tt>y</tt> has a type of <tt>std::ostream&amp;</tt>, and
+  our example compiles.</p>
+  <hr>
 
-<hr>
-<p>Copyright &copy; 2000 Cadenza New Zealand Ltd.  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><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
+  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  height="31" width="88"></a></p>
 
-<p>Revised 28 June 2000</p>
+  <p>Revised 
+  <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->02
+  December, 2006<!--webbot bot="Timestamp" endspan i-checksum="38510" --></p>
 
+  <p><i>Copyright &copy; 2000 Cadenza New Zealand Ltd.</i></p>
+
+  <p><i>Distributed under the Boost Software License, Version 1.0. (See
+  accompanying file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or
+  copy at <a href=
+  "http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)</i></p>
 </body>
 </html>
diff --git a/function_test.cpp b/function_test.cpp
index 8c2307b..ed7eb8d 100644
--- a/function_test.cpp
+++ b/function_test.cpp
@@ -1,25 +1,102 @@
 // ------------------------------------------------------------------------------
+// Copyright (c) 2000 Cadenza New Zealand Ltd
+// Distributed under the Boost Software License, Version 1.0. (See accompany-
+// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// ------------------------------------------------------------------------------
 // Tests for the Boost functional.hpp header file
 //
 // Note that functional.hpp relies on partial specialisation to be
 // effective.  If your compiler lacks this feature, very few of the
 // tests would compile, and so have been excluded from the test.
 // ------------------------------------------------------------------------------
-// Copyright (c) 2000
-// Cadenza New Zealand Ltd
-//
-// 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 the copyright notice and this permission notice
-// appear in supporting documentation.  Cadenza New Zealand Ltd makes
-// no representations about the suitability of this software for any
-// purpose.  It is provided "as is" without express or implied
-// warranty.
-// ------------------------------------------------------------------------------
 // $Id$
 // ------------------------------------------------------------------------------
 // $Log$
+// Revision 1.2.24.1  2006/12/02 14:17:26  andreas_huber69
+// Merged L & C issue fixes from trunk to branch.
+//
+// Revision 1.3  2006/12/02 13:57:32  andreas_huber69
+// Fixed license & copyright issues.
+//
+// From Mark Rodgers Fri Dec 1 12:59:14 2006
+// X-Apparently-To: ahd6974-boostorg -at- yahoo.com via 68.142.206.160; Fri, 01 Dec 2006 12:59:41 -0800
+// X-Originating-IP: [195.112.4.54]
+// Return-Path: <mark.rodgers -at- cadenza.co.nz>
+// Authentication-Results: mta550.mail.mud.yahoo.com from=cadenza.co.nz; domainkeys=neutral (no sig)
+// Received: from 195.112.4.54 (EHLO smtp.nildram.co.uk) (195.112.4.54) by mta550.mail.mud.yahoo.com with SMTP; Fri, 01 Dec 2006 12:59:40 -0800
+// Received: from snagglepuss.cadenza.co.nz (81-6-246-87.dyn.gotadsl.co.uk [81.6.246.87]) by smtp.nildram.co.uk (Postfix) with ESMTP id D32EA2B6D8C for <ahd6974-boostorg -at- yahoo.com>; Fri, 1 Dec 2006 20:59:35 +0000 (GMT)
+// Received: from penfold.cadenza.co.nz ([192.168.55.56]) by snagglepuss.cadenza.co.nz with esmtp (Exim 4.63) (envelope-from <mark.rodgers -at- cadenza.co.nz>) id J9M4Y9-0009TO-9K for ahd6974-boostorg -at- yahoo.com; Fri, 01 Dec 2006 20:58:57 +0000
+// Message-ID: <457097A2.1090305@cadenza.co.nz>
+// Date: Fri, 01 Dec 2006 20:59:14 +0000
+// From: "Mark Rodgers" <mark.rodgers -at- cadenza.co.nz>
+// User-Agent: Thunderbird 1.5.0.8 (Macintosh/20061025)
+// MIME-Version: 1.0
+// To: ahd6974-boostorg -at- yahoo.com [Edit - Delete]
+// Subject: Re: [boost] Reminder: Need your permission to correct license & copyright issues
+// References: <379990.36007.qm@web33507.mail.mud.yahoo.com>
+// In-Reply-To: <379990.36007.qm@web33507.mail.mud.yahoo.com>
+// Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+// Content-Transfer-Encoding: 7bit
+// Content-Length: 812
+// Gidday Andreas
+//
+// Sure that's fine.  I'm happy for you to do 1, 2 and 3.
+//
+// Regards
+// Mark
+//
+// Andreas Huber wrote:
+// > Hello Mark
+// >
+// > Quite a while ago it was decided that every file that goes into the
+// > 1.34 release of the Boost distribution (www.boost.org) needs uniform
+// > license and copyright information. For more information please see:
+// >
+// > <http://www.boost.org/more/license_info.html>
+// >
+// > You are receiving this email because several files you contributed
+// > lack such information or have an old license:
+// >
+// > boost/functional/functional.hpp
+// > boost/libs/functional/binders.html
+// > boost/libs/functional/function_test.cpp
+// > boost/libs/functional/function_traits.html
+// > boost/libs/functional/index.html
+// > boost/libs/functional/mem_fun.html
+// > boost/libs/functional/negators.html
+// > boost/libs/functional/ptr_fun.html
+// > boost/people/mark_rodgers.htm
+// >
+// > I therefore kindly ask you to grant the permission to do the
+// > following:
+// >
+// > 1. For the files above that already have a license text (all except
+// > mark_rodgers.htm), replace the license text with:
+// >
+// > "Distributed under 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)"
+// >
+// > 2. For the file that does not yet have a license and copyright
+// > (mark_rodgers.htm) add the same license text as under 1. and add the
+// > following copyright:
+// >
+// > "(c) Copyright Mark Rodgers 2000"
+// >
+// > 3. (Optional) I would also want to convert all HTML files to conform
+// > the HTML 4.01 Standard by running them through HTML Tidy, see
+// > <http://tidy.sf.net>
+// >
+// > It would be great if you could grant me permission to do 1 & 2 and
+// > optionally also 3.
+// >
+// > Thank you!
+// >
+// > Regards,
+// >
+// > Andreas Huber
+// >
+//
 // Revision 1.2  2001/09/22 11:52:24  johnmaddock
 // Intel C++ fixes: no void return types supported.
 //
diff --git a/function_traits.html b/function_traits.html
index 13cfe06..c2a841b 100644
--- a/function_traits.html
+++ b/function_traits.html
@@ -1,137 +1,166 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Boost Function Object Adapter Library</title>
+  <meta http-equiv="Content-Language" content="en-us">
+  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+
+  <title>Boost Function Object Adapter Library</title>
 </head>
 
 <body bgcolor="#FFFFFF" text="#000000">
+  <table border="1" bgcolor="#007F7F" cellpadding="2" summary="">
+    <tr>
+      <td bgcolor="#FFFFFF"><img src="../../boost.png" alt=
+      "boost.png (6897 bytes)" width="277" height="86"></td>
 
-<table border="1" bgcolor="#007F7F" cellpadding="2">
-  <tr>
-    <td bgcolor="#FFFFFF"><img src="../../boost.png" alt="boost.png (6897 bytes)" WIDTH="277" HEIGHT="86"></td>
-    <td><a href="../../index.htm"><font face="Arial" color="#FFFFFF"><big>Home </big></font></a></td>
-    <td><a href="../libraries.htm"><font face="Arial" color="#FFFFFF"><big>Libraries </big></font></a></td>
-    <td><a href="../../people/people.htm"><font face="Arial" color="#FFFFFF"><big>People </big></font></a></td>
-    <td><a href="../../more/faq.htm"><font face="Arial" color="#FFFFFF"><big>FAQ </big></font></a></td>
-    <td><a href="../../more/index.htm"><font face="Arial" color="#FFFFFF"><big>More </big></font></a></td>
-  </tr>
-</table>
+      <td><a href="../../index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Home</big></font></a></td>
 
-<h1>Function Object Traits</h1>
+      <td><a href="../libraries.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Libraries</big></font></a></td>
 
-<p>The header <nobr><a
-href="../../boost/functional.hpp">functional.hpp</a></nobr> provides two
-traits class templates for functions and function objects:</p>
+      <td><a href="../../people/people.htm"><font face="Arial" color=
+      "#FFFFFF"><big>People</big></font></a></td>
 
-<table border="1">
-<tr>
-	<th>Type</th>
-	<th>Contents</th>
-	<th>Description</th>
-</tr>
-<tr>
-	<td valign="top" rowspan="4"><tt><nobr>template &lt;typename T&gt;</nobr><br><nobr>struct unary_traits<nobr></tt>
-	</td>
-	<td valign="top"><tt><nobr>function_type</nobr></tt>
-	</td>
-	<td valign="top">The type of the function or function object itself (i.e., <tt>T</tt>).
-	</td>
-</tr>
-<tr>
-	<td valign="top"><tt><nobr>param_type</nobr></tt>
-	</td>
-	<td valign="top">The type that should be used to pass the function or function object as a parameter.
-	</td>
-</tr>
-<tr>
-	<td valign="top"><tt><nobr>result_type</nobr></tt>
-	</td>
-	<td valign="top">The type returned by the function or function object.
-	</td>
-</tr>
-<tr>
-	<td valign="top"><tt><nobr>argument_type</nobr></tt>
-	</td>
-	<td valign="top">The type of the argument to the function or function object.
-	</td>
-</tr>
-<tr>
-	<td valign="top" rowspan="5"><tt><nobr>template &lt;typename T&gt;</nobr><br><nobr>struct binary_traits<nobr></tt>
-	</td>
-	<td valign="top"><tt><nobr>function_type</nobr></tt>
-	</td>
-	<td valign="top">The type of the function or function object itself (i.e., <tt>T</tt>).
-	</td>
-</tr>
-<tr>
-	<td valign="top"><tt><nobr>param_type</nobr></tt>
-	</td>
-	<td valign="top">The type that should be used to pass the function or function object as a parameter.
-	</td>
-</tr>
-<tr>
-	<td valign="top"><tt><nobr>result_type</nobr></tt>
-	</td>
-	<td valign="top">The type returned by the function or function object.
-	</td>
-</tr>
-<tr>
-	<td valign="top"><tt><nobr>first_argument_type</nobr></tt>
-	</td>
-	<td valign="top">The type of the first argument to the function or function object.
-	</td>
-</tr>
-<tr>
-	<td valign="top"><tt><nobr>second_argument_type</nobr></tt>
-	</td>
-	<td valign="top">The type of the second argument to the function or function object.
-	</td>
-</tr>
-</table>
+      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      "#FFFFFF"><big>FAQ</big></font></a></td>
 
-<h3>Usage</h3>
+      <td><a href="../../more/index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>More</big></font></a></td>
+    </tr>
+  </table>
 
-<p><tt><nobr>unary_traits</nobr></tt> should be instantiated with
-either a function taking a single parameter, or an adaptable unary
-function object (i.e., a class derived from
-<tt><nobr>std::unary_function</nobr></tt> or one which provides the
-same typedefs).  (See &sect;20.3.1 in the C++ Standard.)
+  <h1>Function Object Traits</h1>
 
-<p><tt><nobr>binary_traits</nobr></tt> should be instantiated with
-either a function taking two parameters, or an adaptable binary
-function object (i.e., a class derived from
-<tt><nobr>std::binary_function</nobr></tt> or one which provides the
-same typedefs).  (See &sect;20.3.1 in the C++ Standard.)
+  <p>The header <a href="../../boost/functional.hpp">functional.hpp</a>
+  provides two traits class templates for functions and function objects:</p>
 
-<p>The most common usage of these templates is in function object
-adapters, thus allowing them to adapt plain functions as well as
-function objects.  You can do this by wherever you would normally
-write, for example,
+  <table border="1" summary="">
+    <tr>
+      <th>Type</th>
 
-<blockquote><pre>
+      <th>Contents</th>
+
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td valign="top" rowspan="4">
+      <tt>template&nbsp;&lt;typename&nbsp;T&gt;<br>
+      struct&nbsp;unary_traits</tt></td>
+
+      <td valign="top"><tt>function_type</tt></td>
+
+      <td valign="top">The type of the function or function object itself
+      (i.e., <tt>T</tt>).</td>
+    </tr>
+
+    <tr>
+      <td valign="top"><tt>param_type</tt></td>
+
+      <td valign="top">The type that should be used to pass the function or
+      function object as a parameter.</td>
+    </tr>
+
+    <tr>
+      <td valign="top"><tt>result_type</tt></td>
+
+      <td valign="top">The type returned by the function or function
+      object.</td>
+    </tr>
+
+    <tr>
+      <td valign="top"><tt>argument_type</tt></td>
+
+      <td valign="top">The type of the argument to the function or function
+      object.</td>
+    </tr>
+
+    <tr>
+      <td valign="top" rowspan="5">
+      <tt>template&nbsp;&lt;typename&nbsp;T&gt;<br>
+      struct&nbsp;binary_traits</tt></td>
+
+      <td valign="top"><tt>function_type</tt></td>
+
+      <td valign="top">The type of the function or function object itself
+      (i.e., <tt>T</tt>).</td>
+    </tr>
+
+    <tr>
+      <td valign="top"><tt>param_type</tt></td>
+
+      <td valign="top">The type that should be used to pass the function or
+      function object as a parameter.</td>
+    </tr>
+
+    <tr>
+      <td valign="top"><tt>result_type</tt></td>
+
+      <td valign="top">The type returned by the function or function
+      object.</td>
+    </tr>
+
+    <tr>
+      <td valign="top"><tt>first_argument_type</tt></td>
+
+      <td valign="top">The type of the first argument to the function or
+      function object.</td>
+    </tr>
+
+    <tr>
+      <td valign="top"><tt>second_argument_type</tt></td>
+
+      <td valign="top">The type of the second argument to the function or
+      function object.</td>
+    </tr>
+  </table>
+
+  <h3>Usage</h3>
+
+  <p><tt>unary_traits</tt> should be instantiated with either a function
+  taking a single parameter, or an adaptable unary function object (i.e., a
+  class derived from <tt>std::unary_function</tt> or one which provides the
+  same typedefs). (See &sect;20.3.1 in the C++ Standard.)</p>
+
+  <p><tt>binary_traits</tt> should be instantiated with either a function
+  taking two parameters, or an adaptable binary function object (i.e., a
+  class derived from <tt>std::binary_function</tt> or one which provides the
+  same typedefs). (See &sect;20.3.1 in the C++ Standard.)</p>
+
+  <p>The most common usage of these templates is in function object adapters,
+  thus allowing them to adapt plain functions as well as function objects.
+  You can do this by wherever you would normally write, for example,</p>
+
+  <blockquote>
+    <pre>
 typename Operation::argument_type
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>simply writing
+  <p>simply writing</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 typename boost::unary_traits&lt;Operation&gt;::argument_type
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>instead.
+  <p>instead.</p>
 
-<h3>Additional Types Defined</h3>
+  <h3>Additional Types Defined</h3>
 
-<p>In addition to the standard result and argument typedefs, these
-traits templates define two additional types.
+  <p>In addition to the standard result and argument typedefs, these traits
+  templates define two additional types.</p>
 
-<h4><tt>function_type</tt></h4>
+  <h4><tt>function_type</tt></h4>
 
-<p>This is the type of the function or function object, and can be
-used in declarations such as</p>
+  <p>This is the type of the function or function object, and can be used in
+  declarations such as</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 template &lt;class Predicate&gt;
 class unary_negate : // ...
 {
@@ -139,19 +168,21 @@ class unary_negate : // ...
   private:
     <strong>typename unary_traits&lt;Predicate&gt;::function_type</strong> pred;
 };
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>If this typedef were not provided, it would not be possible to
-declare <tt>pred</tt> in a way that would allow
-<tt><nobr>unary_negate</nobr></tt> to be instantiated with a function
-type (see the C++ Standard &sect;14.3.1 &para;3).
+  <p>If this typedef were not provided, it would not be possible to declare
+  <tt>pred</tt> in a way that would allow <tt>unary_negate</tt> to be
+  instantiated with a function type (see the C++ Standard &sect;14.3.1
+  &para;3).</p>
 
-<h4><tt>param_type</tt></h4>
+  <h4><tt>param_type</tt></h4>
 
-<p>This is a type suitable for passing the function or function object
-as a parameter to another function.  For example,
+  <p>This is a type suitable for passing the function or function object as a
+  parameter to another function. For example,</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 template &lt;class Predicate&gt;
 class unary_negate : // ...
 {
@@ -162,35 +193,41 @@ class unary_negate : // ...
     {}
     // ...
 };
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>Function objects are passed by reference to const; function
-pointers are passed by value.</p>
+  <p>Function objects are passed by reference to const; function pointers are
+  passed by value.</p>
 
+  <h3>Limitations</h3>
 
-<h3>Limitations</h3>
+  <p>This library uses these traits within all function object adapters,
+  theoretically rendering <tt>ptr_fun</tt> obsolete. However, third party
+  adapters probably won't take advantage of this mechanism, and so
+  <tt>ptr_fun</tt> may still be required. Accordingly, this library also
+  provides <a href="ptr_fun.html">improved versions of the standard function
+  pointer adapters</a>.</p>
 
-<p>This library uses these traits within all function object adapters,
-theoretically rendering <tt><nobr>ptr_fun</nobr></tt> obsolete.
-However, third party adapters probably won't take advantage of this
-mechanism, and so <tt><nobr>ptr_fun</nobr></tt> may still be required.
-Accordingly, this library also provides <a
-href="ptr_fun.html">improved versions of the standard function pointer
-adapters</a>.</p>
+  <p>These traits templates will also not work with compilers that fail to
+  support partial specialisation of templates. With these compilers, the
+  traits templates can only be instantiated with adaptable function objects,
+  thus requiring <tt>ptr_fun</tt> to be used, even with the function object
+  adapters in this library.</p>
+  <hr>
 
-<p>These traits templates will also not work with compilers that fail
-to support partial specialisation of templates.  With these compilers,
-the traits templates can only be instantiated with adaptable function
-objects, thus requiring <tt><nobr>ptr_fun</nobr></tt> to be used, even
-with the function object adapters in this library.
+  <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
+  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  height="31" width="88"></a></p>
 
-<hr>
-<p>Copyright &copy; 2000 Cadenza New Zealand Ltd.  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>Revised 
+  <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->02
+  December, 2006<!--webbot bot="Timestamp" endspan i-checksum="38510" --></p>
 
-<p>Revised 28 June 2000</p>
+  <p><i>Copyright &copy; 2000 Cadenza New Zealand Ltd.</i></p>
+
+  <p><i>Distributed under the Boost Software License, Version 1.0. (See
+  accompanying file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or
+  copy at <a href=
+  "http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)</i></p>
 </body>
 </html>
diff --git a/include/boost/functional.hpp b/include/boost/functional.hpp
index 39ccc30..b618485 100644
--- a/include/boost/functional.hpp
+++ b/include/boost/functional.hpp
@@ -1,19 +1,11 @@
 // ------------------------------------------------------------------------------
+// Copyright (c) 2000 Cadenza New Zealand Ltd
+// Distributed under the Boost Software License, Version 1.0. (See accompany-
+// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// ------------------------------------------------------------------------------
 // Boost functional.hpp header file
 // See http://www.boost.org/libs/functional for documentation.
 // ------------------------------------------------------------------------------
-// Copyright (c) 2000
-// Cadenza New Zealand Ltd
-//
-// 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 the copyright notice and this permission notice
-// appear in supporting documentation.  Cadenza New Zealand Ltd makes
-// no representations about the suitability of this software for any
-// purpose.  It is provided "as is" without express or implied
-// warranty.
-// ------------------------------------------------------------------------------
 // $Id$
 // ------------------------------------------------------------------------------
 
diff --git a/index.html b/index.html
index 65766a8..2dd91a0 100644
--- a/index.html
+++ b/index.html
@@ -1,97 +1,140 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Boost Function Object Adapter Library</title>
+  <meta http-equiv="Content-Language" content="en-us">
+  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+  <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
+  <meta name="ProgId" content="FrontPage.Editor.Document">
+
+  <title>Boost Function Object Adapter Library</title>
 </head>
 
 <body bgcolor="#FFFFFF" text="#000000">
+  <table border="1" bgcolor="#007F7F" cellpadding="2" summary="">
+    <tr>
+      <td bgcolor="#FFFFFF"><img src="../../boost.png" alt=
+      "boost.png (6897 bytes)" width="277" height="86"></td>
 
-<table border="1" bgcolor="#007F7F" cellpadding="2">
-  <tr>
-    <td bgcolor="#FFFFFF"><img src="../../boost.png" alt="boost.png (6897 bytes)" width="277" height="86"></td>
-    <td><a href="../../index.htm"><font face="Arial" color="#FFFFFF"><big>Home</big></font></a></td>
-    <td><a href="../libraries.htm"><font face="Arial" color="#FFFFFF"><big>Libraries</big></font></a></td>
-    <td><a href="../../people/people.htm"><font face="Arial" color="#FFFFFF"><big>People</big></font></a></td>
-    <td><a href="../../more/faq.htm"><font face="Arial" color="#FFFFFF"><big>FAQ</big></font></a></td>
-    <td><a href="../../more/index.htm"><font face="Arial" color="#FFFFFF"><big>More</big></font></a></td>
-  </tr>
-</table>
-<h1>Improved Function Object Adapters</h1>
-<p>The header <nobr><a href="../../boost/functional.hpp">functional.hpp</a></nobr>
-provides enhancements to the function object adapters specified in the C++
-Standard Library (sections 20.3.5, through to 20.3.8). The enhancements are
-principally possible due to two changes:</p>
-<ol>
-  <li>We use the Boost <nobr><tt><a href="../utility/call_traits.htm">call_traits</a></tt></nobr>
-    templates to avoid the problem of <a href="binders.html#refref">references
-    to references</a>, and to improve the efficiency of <a href="mem_fun.html#args">parameter
+      <td><a href="../../index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Home</big></font></a></td>
+
+      <td><a href="../libraries.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Libraries</big></font></a></td>
+
+      <td><a href="../../people/people.htm"><font face="Arial" color=
+      "#FFFFFF"><big>People</big></font></a></td>
+
+      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      "#FFFFFF"><big>FAQ</big></font></a></td>
+
+      <td><a href="../../more/index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>More</big></font></a></td>
+    </tr>
+  </table>
+
+  <h1>Improved Function Object Adapters</h1>
+
+  <p>The header <a href="../../boost/functional.hpp">functional.hpp</a>
+  provides enhancements to the function object adapters specified in the C++
+  Standard Library (sections 20.3.5, through to 20.3.8). The enhancements are
+  principally possible due to two changes:</p>
+
+  <ol>
+    <li>We use the Boost <tt><a href=
+    "../utility/call_traits.htm">call_traits</a></tt> templates to avoid the
+    problem of <a href="binders.html#refref">references to references</a>,
+    and to improve the efficiency of <a href="mem_fun.html#args">parameter
     passing</a>.</li>
-  <li>We use two <a href="function_traits.html">function object traits</a> class
-    templates to avoid the need for <nobr><tt><a href="ptr_fun.html">ptr_fun</a></tt></nobr>
-    with the adapters in this library.</li>
-</ol>
-<h3>Contents</h3>
-<p>The header contains the following function and class templates:</p>
-<table border="1" cellpadding="5">
-  <tr>
-    <th align="left"><a href="function_traits.html">Function object traits</a>
-    <td valign="top"><tt><nobr>unary_traits</nobr><br>
-      <nobr>binary_traits</nobr></tt></td>
-    <td valign="top">Used to determine the types of function objects' and
-      functions' arguments. Eliminate the necessity for <nobr><tt>ptr_fun</tt></nobr>.</td>
-  </tr>
-  <tr>
-    <th align="left"><a href="negators.html">Negators</a></th>
-    <td valign="top"><tt><nobr>unary_negate</nobr><br>
-      <nobr>binary_negate</nobr><br>
-      <nobr>not1</nobr><br>
-      <nobr>not2</nobr></tt></td>
-    <td valign="top">Based on section 20.3.5 of the standard.</td>
-  </tr>
-  <tr>
-    <th align="left"><a href="binders.html">Binders</a></th>
-    <td valign="top"><tt><nobr>binder1st</nobr><br>
-      <nobr>binder2nd</nobr><br>
-      <nobr>bind1st</nobr><br>
-      <nobr>bind2nd</nobr></tt></td>
-    <td valign="top">Based on section 20.3.6 of the standard.</td>
-  </tr>
-  <tr>
-    <th align="left"><a href="ptr_fun.html">Adapters for pointers to functions</a></th>
-    <td valign="top"><tt><nobr>pointer_to_unary_function</nobr><br>
-      <nobr>pointer_to_binary_function</nobr><br>
-      <nobr>ptr_fun</nobr></tt></td>
-    <td valign="top">Based on section 20.3.7 of the standard. Not required for
-      use with this library since the binders and negators can adapt functions,
-      but may be needed with third party adapters.</td>
-  </tr>
-  <tr>
-    <th align="left"><a href="mem_fun.html">Adapters for pointers to member
+
+    <li>We use two <a href="function_traits.html">function object traits</a>
+    class templates to avoid the need for <tt><a href=
+    "ptr_fun.html">ptr_fun</a></tt> with the adapters in this library.</li>
+  </ol>
+
+  <h3>Contents</h3>
+
+  <p>The header contains the following function and class templates:</p>
+
+  <table border="1" cellpadding="5" summary="">
+    <tr>
+      <th align="left"><a href="function_traits.html">Function object
+      traits</a></th>
+
+      <td valign="top"><tt>unary_traits<br>
+      binary_traits</tt></td>
+
+      <td valign="top">Used to determine the types of function objects' and
+      functions' arguments. Eliminate the necessity for
+      <tt>ptr_fun</tt>.</td>
+    </tr>
+
+    <tr>
+      <th align="left"><a href="negators.html">Negators</a></th>
+
+      <td valign="top"><tt>unary_negate<br>
+      binary_negate<br>
+      not1<br>
+      not2</tt></td>
+
+      <td valign="top">Based on section 20.3.5 of the standard.</td>
+    </tr>
+
+    <tr>
+      <th align="left"><a href="binders.html">Binders</a></th>
+
+      <td valign="top"><tt>binder1st<br>
+      binder2nd<br>
+      bind1st<br>
+      bind2nd</tt></td>
+
+      <td valign="top">Based on section 20.3.6 of the standard.</td>
+    </tr>
+
+    <tr>
+      <th align="left"><a href="ptr_fun.html">Adapters for pointers to
       functions</a></th>
-    <td valign="top"><tt><nobr>mem_fun_t</nobr><br>
-      <nobr>mem_fun1_t</nobr><br>
-      <nobr>const_mem_fun_t</nobr><br>
-      <nobr>const_mem_fun1_t</nobr><br>
-      <nobr>mem_fun_ref_t</nobr><br>
-      <nobr>mem_fun1_ref_t</nobr><br>
-      <nobr>const_mem_fun_ref_t</nobr><br>
-      <nobr>const_mem_fun1_ref_t</nobr><br>
-      <nobr>mem_fun</nobr><br>
-      <nobr>mem_fun_ref</nobr></tt></td>
-    <td valign="top">Based on section 20.3.8 of the standard.</td>
-  </tr>
-</table>
-<h3>Usage</h3>
-<p>Using these adapters should be pretty much the same as using the standard
-function object adapters; the only differences are that you need to write <nobr><tt>boost::</tt></nobr>
-instead of <nobr><tt>std::</tt></nobr>, and that you will get fewer headaches.</p>
-<p>For example, suppose you had a <tt>Person</tt> class that contained a <nobr><tt>set_name</tt></nobr>
-function:
-<blockquote>
-  <pre>
+
+      <td valign="top"><tt>pointer_to_unary_function<br>
+      pointer_to_binary_function<br>
+      ptr_fun</tt></td>
+
+      <td valign="top">Based on section 20.3.7 of the standard. Not required
+      for use with this library since the binders and negators can adapt
+      functions, but may be needed with third party adapters.</td>
+    </tr>
+
+    <tr>
+      <th align="left"><a href="mem_fun.html">Adapters for pointers to member
+      functions</a></th>
+
+      <td valign="top"><tt>mem_fun_t<br>
+      mem_fun1_t<br>
+      const_mem_fun_t<br>
+      const_mem_fun1_t<br>
+      mem_fun_ref_t<br>
+      mem_fun1_ref_t<br>
+      const_mem_fun_ref_t<br>
+      const_mem_fun1_ref_t<br>
+      mem_fun<br>
+      mem_fun_ref</tt></td>
+
+      <td valign="top">Based on section 20.3.8 of the standard.</td>
+    </tr>
+  </table>
+
+  <h3>Usage</h3>
+
+  <p>Using these adapters should be pretty much the same as using the
+  standard function object adapters; the only differences are that you need
+  to write <tt>boost::</tt> instead of <tt>std::</tt>, and that you will get
+  fewer headaches.</p>
+
+  <p>For example, suppose you had a <tt>Person</tt> class that contained a
+  <tt>set_name</tt> function:</p>
+
+  <blockquote>
+    <pre>
 class Person
 {
   public:
@@ -99,86 +142,122 @@ class Person
   // ...
 };
 </pre>
-</blockquote>
-<p>You could rename a bunch of people in a collection, <tt>c</tt>, by writing</p>
-<blockquote>
-  <pre>
+  </blockquote>
+
+  <p>You could rename a bunch of people in a collection, <tt>c</tt>, by
+  writing</p>
+
+  <blockquote>
+    <pre>
 std::for_each(c.begin(), c.end(), 
-              boost::bind2nd(boost::mem_fun_ref(&amp;Person::set_name), &quot;Fred&quot;));
+              boost::bind2nd(boost::mem_fun_ref(&amp;Person::set_name), "Fred"));
 </pre>
-</blockquote>
-<p>If the standard adapters had been used instead then this code would normally
-fail to compile, because <tt><nobr>set_name</nobr></tt> takes a reference
-argument. Refer to the comments in the <a href="binders.html#refref">binder
-documentation</a> to explain why this is so.</p>
-<h3>Compiler Compatibility</h3>
-<p>The header and <a href="function_test.cpp">test program</a> have been
-compiled with the following compilers:</p>
-<table border="1" cellpadding="5">
-  <tr>
-    <th>Compiler</th>
-    <th>Comments</th>
-  </tr>
-  <tr>
-    <td valign="top">Borland C++Builder 4 Update 2</td>
-    <td valign="top">No known issues.</td>
-  </tr>
-  <tr>
-    <td valign="top">Borland C++ 5.5</td>
-    <td valign="top">No known issues.</td>
-  </tr>
-  <tr>
-    <td valign="top">g++ 2.95.2</td>
-    <td valign="top">No known issues.</td>
-  </tr>
-  <tr>
-    <td valign="top">Microsoft Visual C++ Service Pack 3</td>
-    <td valign="top">Compiler lacks partial specialisation, so this library
-      offers little more than is provided by the standard adapters:
-      <ul>
-        <li>The <nobr><tt>call_traits</tt></nobr> mechanism is unable to prevent
-          references to references, and so the adapters in this library will be
-          usable in fewer situations.</li>
-        <li>The <nobr><tt>function_traits</tt></nobr> mechanism is unable to
-          determine the argument and result types of functions, therefore <nobr><tt>ptr_fun</tt></nobr>
-          continues to be required to adapt functions.
-      </ul>
-    </td>
-  </tr>
-</table>
-<h3>Future Directions</h3>
-<p>This library's primary focus is to solve the problem of references to
-references while maintaining as much compatibility as possible with the standard
-library. This allows you to use the techniques you read about in books and
-magazines with many of today's compilers.</p>
-<p>In the longer term, even better solutions are likely:</p>
-<ol>
-  <li>Several Boost members are working on expression template libraries. These
-    will allow a more natural syntax for combining and adapting functions. As
-    this is a new technology, it may be some time before it has matured and is
-    widely supported by major compilers but shows great promise. In the
-    meantime, the functional.hpp library fills the gap.</li>
-  <li>The Standard Committee has recognised the problem of references to
-    references occurring during template instantiation and has moved to fix the
-    standard (see the <a href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
+  </blockquote>
+
+  <p>If the standard adapters had been used instead then this code would
+  normally fail to compile, because <tt>set_name</tt> takes a reference
+  argument. Refer to the comments in the <a href="binders.html#refref">binder
+  documentation</a> to explain why this is so.</p>
+
+  <h3>Compiler Compatibility</h3>
+
+  <p>The header and <a href="function_test.cpp">test program</a> have been
+  compiled with the following compilers:</p>
+
+  <table border="1" cellpadding="5" summary="">
+    <tr>
+      <th>Compiler</th>
+
+      <th>Comments</th>
+    </tr>
+
+    <tr>
+      <td valign="top">Borland C++Builder 4 Update 2</td>
+
+      <td valign="top">No known issues.</td>
+    </tr>
+
+    <tr>
+      <td valign="top">Borland C++ 5.5</td>
+
+      <td valign="top">No known issues.</td>
+    </tr>
+
+    <tr>
+      <td valign="top">g++ 2.95.2</td>
+
+      <td valign="top">No known issues.</td>
+    </tr>
+
+    <tr>
+      <td valign="top">Microsoft Visual C++ Service Pack 3</td>
+
+      <td valign="top">
+        Compiler lacks partial specialisation, so this library offers little
+        more than is provided by the standard adapters:
+
+        <ul>
+          <li>The <tt>call_traits</tt> mechanism is unable to prevent
+          references to references, and so the adapters in this library will
+          be usable in fewer situations.</li>
+
+          <li>The <tt>function_traits</tt> mechanism is unable to determine
+          the argument and result types of functions, therefore
+          <tt>ptr_fun</tt> continues to be required to adapt functions.</li>
+        </ul>
+      </td>
+    </tr>
+  </table>
+
+  <h3>Future Directions</h3>
+
+  <p>This library's primary focus is to solve the problem of references to
+  references while maintaining as much compatibility as possible with the
+  standard library. This allows you to use the techniques you read about in
+  books and magazines with many of today's compilers.</p>
+
+  <p>In the longer term, even better solutions are likely:</p>
+
+  <ol>
+    <li>Several Boost members are working on expression template libraries.
+    These will allow a more natural syntax for combining and adapting
+    functions. As this is a new technology, it may be some time before it has
+    matured and is widely supported by major compilers but shows great
+    promise. In the meantime, the functional.hpp library fills the gap.</li>
+
+    <li>The Standard Committee has recognised the problem of references to
+    references occurring during template instantiation and has moved to fix
+    the standard (see the <a href=
+    "http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
     standard core language active issues list</a>).</li>
-</ol>
-<h3>Author</h3>
-<p><a href="../../people/mark_rodgers.htm">Mark Rodgers</a></p>
-<h3>Acknowledgements</h3>
-<p>Thanks to <a href="../../people/john_maddock.htm">John Maddock</a> for
-suggesting the mechanism that allowed the function objects traits to work
-correctly. <a href="../../people/jens_maurer.htm">Jens Maurer</a> provided
-invaluable feedback during the <a href="../../more/formal_review_process.htm">formal
-review process</a>.
-<hr>
-<p>Copyright © 2000 Cadenza New Zealand Ltd. 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>Revised 28 June 2000</p>
+  </ol>
 
+  <h3>Author</h3>
+
+  <p><a href="../../people/mark_rodgers.htm">Mark Rodgers</a></p>
+
+  <h3>Acknowledgements</h3>
+
+  <p>Thanks to <a href="../../people/john_maddock.htm">John Maddock</a> for
+  suggesting the mechanism that allowed the function objects traits to work
+  correctly. <a href="../../people/jens_maurer.htm">Jens Maurer</a> provided
+  invaluable feedback during the <a href=
+  "../../more/formal_review_process.htm">formal review process</a>.</p>
+  <hr>
+
+  <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
+  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  height="31" width="88"></a></p>
+
+  <p>Revised 
+  <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->02
+  December, 2006<!--webbot bot="Timestamp" endspan i-checksum="38510" --></p>
+
+  <p><i>Copyright &copy; 2000 Cadenza New Zealand Ltd.</i></p>
+
+  <p><i>Distributed under the Boost Software License, Version 1.0. (See
+  accompanying file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or
+  copy at <a href=
+  "http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)</i></p>
 </body>
-
 </html>
diff --git a/mem_fun.html b/mem_fun.html
index 84b70ec..3fcff5f 100644
--- a/mem_fun.html
+++ b/mem_fun.html
@@ -1,171 +1,201 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Boost Function Object Adapter Library</title>
+  <meta http-equiv="Content-Language" content="en-us">
+  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+
+  <title>Boost Function Object Adapter Library</title>
 </head>
 
 <body bgcolor="#FFFFFF" text="#000000">
+  <table border="1" bgcolor="#007F7F" cellpadding="2" summary="">
+    <tr>
+      <td bgcolor="#FFFFFF"><img src="../../boost.png" alt=
+      "boost.png (6897 bytes)" width="277" height="86"></td>
 
-<table border="1" bgcolor="#007F7F" cellpadding="2">
-  <tr>
-    <td bgcolor="#FFFFFF"><img src="../../boost.png" alt="boost.png (6897 bytes)" WIDTH="277" HEIGHT="86"></td>
-    <td><a href="../../index.htm"><font face="Arial" color="#FFFFFF"><big>Home </big></font></a></td>
-    <td><a href="../libraries.htm"><font face="Arial" color="#FFFFFF"><big>Libraries </big></font></a></td>
-    <td><a href="../../people/people.htm"><font face="Arial" color="#FFFFFF"><big>People </big></font></a></td>
-    <td><a href="../../more/faq.htm"><font face="Arial" color="#FFFFFF"><big>FAQ </big></font></a></td>
-    <td><a href="../../more/index.htm"><font face="Arial" color="#FFFFFF"><big>More </big></font></a></td>
-  </tr>
-</table>
+      <td><a href="../../index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Home</big></font></a></td>
 
-<h1>Member Function Adapters</h1>
+      <td><a href="../libraries.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Libraries</big></font></a></td>
 
-<p>The header <nobr><a
-href="../../boost/functional.hpp">functional.hpp</a></nobr> includes
-improved versions of the full range of member function adapters from
-the the C++ Standard Library <nobr>(&sect 20.3.8):</nobr></p>
+      <td><a href="../../people/people.htm"><font face="Arial" color=
+      "#FFFFFF"><big>People</big></font></a></td>
 
-<ul>
-<li><tt>mem_fun_t</tt></li>
-<li><tt>mem_fun1_t</tt></li>
-<li><tt>const_mem_fun_t</tt></li>
-<li><tt>const_mem_fun1_t</tt></li>
-<li><tt>mem_fun_ref_t</tt></li>
-<li><tt>mem_fun1_ref_t</tt></li>
-<li><tt>const_mem_fun_ref_t</tt></li>
-<li><tt>const_mem_fun1_ref_t</tt></li>
-</ul>
+      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      "#FFFFFF"><big>FAQ</big></font></a></td>
 
-<p>as well as the corresponding overloaded helper functions<p>
-<ul>
-<li><tt>mem_fun</tt></li>
-<li><tt>mem_fun_ref</tt></li>
-</ul>
+      <td><a href="../../more/index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>More</big></font></a></td>
+    </tr>
+  </table>
 
-<p>The following changes have been made to the adapters as specified
-in the Standard:</p>
+  <h1>Member Function Adapters</h1>
 
-<ul>
-<li>The <tt><nobr>first_argument_type</nobr></tt> typedef has been
-corrected for the <nobr><tt>const_</tt></nobr> family of member
-function adapters (see <a href="#firstarg">below</a>).</li>
+  <p>The header <a href="../../boost/functional.hpp">functional.hpp</a>
+  includes improved versions of the full range of member function adapters
+  from the the C++ Standard Library (&sect;20.3.8):</p>
 
-<li>The argument passed to <tt><nobr>mem_fun1_t</nobr></tt> and its
-variants is passed using the
-<tt><nobr>call_traits::param_type</nobr></tt> for the member
-function's argument type.
-</ul>
+  <ul>
+    <li><tt>mem_fun_t</tt></li>
 
-<h3 id="firstarg">first_argument_type</h3>
+    <li><tt>mem_fun1_t</tt></li>
 
-<p>The standard specifies <tt><nobr>const_mem_fun1_t</nobr></tt>, for example, like this:
+    <li><tt>const_mem_fun_t</tt></li>
 
-<blockquote><pre>
+    <li><tt>const_mem_fun1_t</tt></li>
+
+    <li><tt>mem_fun_ref_t</tt></li>
+
+    <li><tt>mem_fun1_ref_t</tt></li>
+
+    <li><tt>const_mem_fun_ref_t</tt></li>
+
+    <li><tt>const_mem_fun1_ref_t</tt></li>
+  </ul>
+
+  <p>as well as the corresponding overloaded helper functions</p>
+
+  <ul>
+    <li><tt>mem_fun</tt></li>
+
+    <li><tt>mem_fun_ref</tt></li>
+  </ul>
+
+  <p>The following changes have been made to the adapters as specified in the
+  Standard:</p>
+
+  <ul>
+    <li>The <tt>first_argument_type</tt> typedef has been corrected for the
+    <tt>const_</tt> family of member function adapters (see <a href=
+    "#firstarg">below</a>).</li>
+
+    <li>The argument passed to <tt>mem_fun1_t</tt> and its variants is passed
+    using the <tt>call_traits::param_type</tt> for the member function's
+    argument type.</li>
+  </ul>
+
+  <h3 id="firstarg">first_argument_type</h3>
+
+  <p>The standard specifies <tt>const_mem_fun1_t</tt>, for example, like
+  this:</p>
+
+  <blockquote>
+    <pre>
 template &lt;class S, class T, class A&gt; class const_mem_fun1_t
   : public binary_function&lt;<strong>T*</strong>, A, S&gt; {
 public:
   explicit const_mem_fun1_t(S (T::*p)(A) const);
   S operator()(<strong>const T*</strong> p, A x) const;
 };
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>Note that the first argument to
-<tt><nobr>binary_function</nobr></tt> is <tt><nobr>T*</nobr></tt>
-despite the fact that the first argument to <tt><nobr>operator()</nobr></tt> is
-actually of type <tt><nobr><em>const</em> T*</nobr></tt>.  
+  <p>Note that the first argument to <tt>binary_function</tt> is <tt>T*</tt>
+  despite the fact that the first argument to <tt>operator()</tt> is actually
+  of type <tt><em>const</em>&nbsp;T*</tt>.</p>
 
-<p>Does this matter?  Well, consider what happens when we write
+  <p>Does this matter? Well, consider what happens when we write</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 struct Foo { void bar(int) const; };
 const Foo *cp = new Foo;
-std::bind1st(std::mem_fun(&Foo::bar), cp);
-</pre></blockquote>
+std::bind1st(std::mem_fun(&amp;Foo::bar), cp);
+</pre>
+  </blockquote>
 
-<p>We have created a <tt><nobr>const_mem_fun1_t</nobr></tt> object
-which will effectively contain the following
+  <p>We have created a <tt>const_mem_fun1_t</tt> object which will
+  effectively contain the following</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 typedef Foo* first_argument_type;
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>The <tt><nobr>bind1st</nobr></tt> will then create a
-<tt><nobr>binder1st</nobr></tt> object that will use this
-<tt><nobr>typedef</nobr></tt> as the type of a member which will be
-initialised with <tt><nobr>cp</nobr></tt>.  In other words, we will
-need to initialise a <tt><nobr>Foo*</nobr></tt> member with a
-<tt><nobr>const Foo*</nobr></tt> pointer!  Clearly this is not
-possible, so to implement this your Standard Library vendor will have
-had to cast away the constness of <tt><nobr>cp</nobr></tt>, probably
-within the body of <tt><nobr>bind1st</nobr></tt>.
+  <p>The <tt>bind1st</tt> will then create a <tt>binder1st</tt> object that
+  will use this <tt>typedef</tt> as the type of a member which will be
+  initialised with <tt>cp</tt>. In other words, we will need to initialise a
+  <tt>Foo*</tt> member with a <tt>const&nbsp;Foo*</tt> pointer! Clearly this
+  is not possible, so to implement this your Standard Library vendor will
+  have had to cast away the constness of <tt>cp</tt>, probably within the
+  body of <tt>bind1st</tt>.</p>
 
-<p>This hack will not suffice with the improved <a
-href="binders.html">binders</a> in this library, so we have had to
-provide corrected versions of the member function adapters as well.
+  <p>This hack will not suffice with the improved <a href=
+  "binders.html">binders</a> in this library, so we have had to provide
+  corrected versions of the member function adapters as well.</p>
 
+  <h3 id="args">Argument Types</h3>
 
-<h3 id="args">Argument Types</h3>
+  <p>The standard defines <tt>mem_fun1_t</tt>, for example, like this
+  (&sect;20.3.8&nbsp;&para;2):</p>
 
-<p>The standard defines <nobr><tt>mem_fun1_t</tt></nobr>, for example, like this
-<nobr>(&sect;20.3.8 &para;2):</nobr>
-
-<blockquote><pre>
+  <blockquote>
+    <pre>
 template &lt;class S, class T, class A&gt; class mem_fun1_t
   : public binary_function&lt;T*, A, S&gt; {
 public:
   explicit mem_fun1_t(S (T::*p)(<strong>A</strong>));
   S operator()(T* p, <strong>A</strong> x) const;
 };
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>Note that the second argument to <nobr><tt>operator()</tt></nobr> is
-exactly the same type as the argument to the member function.  If this
-is a value type, the argument will be passed by value and copied twice.
+  <p>Note that the second argument to <tt>operator()</tt> is exactly the same
+  type as the argument to the member function. If this is a value type, the
+  argument will be passed by value and copied twice.</p>
 
-<p>However, if we were to try and eliminate this inefficiency by
-instead declaring the argument as <nobr><tt>const A&</tt></nobr>, then
-if A were a reference type, we would have a reference to a reference,
-which is currently illegal (but see <a
-href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
-core language issue number 106)</a>
+  <p>However, if we were to try and eliminate this inefficiency by instead
+  declaring the argument as <tt>const&nbsp;A&amp;</tt>, then if A were a
+  reference type, we would have a reference to a reference, which is
+  currently illegal (but see <a href=
+  "http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++ core
+  language issue number 106)</a></p>
 
-<p>So the way in which we want to declare the second argument for
-<nobr><tt>operator()</tt></nobr> depends on whether or not the member
-function's argument is a reference.  If it is a reference, we want to
-declare it simply as <nobr><tt>A</tt></nobr>; if it is a value we want
-to declare it as <nobr><tt>const A&</tt></nobr>.
+  <p>So the way in which we want to declare the second argument for
+  <tt>operator()</tt> depends on whether or not the member function's
+  argument is a reference. If it is a reference, we want to declare it simply
+  as <tt>A</tt>; if it is a value we want to declare it as
+  <tt>const&nbsp;A&amp;</tt>.</p>
 
-<p>The Boost <nobr><a
-href="../utility/call_traits.htm">call_traits</a></nobr> class
-template contains a <tt><nobr>param_type</nobr></tt> typedef, which
-uses partial specialisation to make precisely this decision.  By
-declaring the <nobr><tt>operator()</tt></nobr> as
+  <p>The Boost <a href="../utility/call_traits.htm">call_traits</a> class
+  template contains a <tt>param_type</tt> typedef, which uses partial
+  specialisation to make precisely this decision. By declaring the
+  <tt>operator()</tt> as</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 S operator()(T* p, typename call_traits&lt;A&gt;::param_type x) const
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>we achieve the desired result - we improve efficiency without
-generating references to references.</p>
+  <p>we achieve the desired result - we improve efficiency without generating
+  references to references.</p>
 
-<h3>Limitations</h3>
+  <h3>Limitations</h3>
 
-<p>The call traits template used to realise some improvements relies
-on partial specialisation, so these improvements are only available on
-compilers that support that feature.  With other compilers, the
-argument passed to the member function (in the
-<nobr><tt>mem_fun1_t</tt></nobr> family) will always be passed by
-reference, thus generating the possibility of references to references.
+  <p>The call traits template used to realise some improvements relies on
+  partial specialisation, so these improvements are only available on
+  compilers that support that feature. With other compilers, the argument
+  passed to the member function (in the <tt>mem_fun1_t</tt> family) will
+  always be passed by reference, thus generating the possibility of
+  references to references.</p>
+  <hr>
 
-<hr>
+  <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
+  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  height="31" width="88"></a></p>
 
-<p>Copyright &copy; 2000 Cadenza New Zealand Ltd.  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>Revised 
+  <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->02 December, 2006<!--webbot bot="Timestamp" endspan i-checksum="38510" --></p>
 
-<p>Revised 28 June 2000</p>
+  <p><i>Copyright &copy; 2000 Cadenza New Zealand Ltd.</i></p>
 
+  <p><i>Distributed under the Boost Software License, Version 1.0. (See
+  accompanying file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or
+  copy at <a href=
+  "http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)</i></p>
 </body>
 </html>
diff --git a/negators.html b/negators.html
index 51dac6b..c17c64e 100644
--- a/negators.html
+++ b/negators.html
@@ -1,132 +1,158 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Boost Function Object Adapter Library</title>
+  <meta http-equiv="Content-Language" content="en-us">
+  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+
+  <title>Boost Function Object Adapter Library</title>
 </head>
 
 <body bgcolor="#FFFFFF" text="#000000">
+  <table border="1" bgcolor="#007F7F" cellpadding="2" summary="">
+    <tr>
+      <td bgcolor="#FFFFFF"><img src="../../boost.png" alt=
+      "boost.png (6897 bytes)" width="277" height="86"></td>
 
-<table border="1" bgcolor="#007F7F" cellpadding="2">
-  <tr>
-    <td bgcolor="#FFFFFF"><img src="../../boost.png" alt="boost.png (6897 bytes)" WIDTH="277" HEIGHT="86"></td>
-    <td><a href="../../index.htm"><font face="Arial" color="#FFFFFF"><big>Home </big></font></a></td>
-    <td><a href="../libraries.htm"><font face="Arial" color="#FFFFFF"><big>Libraries </big></font></a></td>
-    <td><a href="../../people/people.htm"><font face="Arial" color="#FFFFFF"><big>People </big></font></a></td>
-    <td><a href="../../more/faq.htm"><font face="Arial" color="#FFFFFF"><big>FAQ </big></font></a></td>
-    <td><a href="../../more/index.htm"><font face="Arial" color="#FFFFFF"><big>More </big></font></a></td>
-  </tr>
-</table>
+      <td><a href="../../index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Home</big></font></a></td>
 
-<h1>Negators</h1>
+      <td><a href="../libraries.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Libraries</big></font></a></td>
 
-<p>The header <nobr><a
-href="../../boost/functional.hpp">functional.hpp</a></nobr> provides
-enhanced versions of both the negator adapters from the C++ Standard
-Library (&sect;20.3.5):</p>
+      <td><a href="../../people/people.htm"><font face="Arial" color=
+      "#FFFFFF"><big>People</big></font></a></td>
 
-<ul>
-<li><tt>unary_negate</tt></li>
-<li><tt>binary_negate</tt></li>
-</ul>
+      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      "#FFFFFF"><big>FAQ</big></font></a></td>
 
-<p>As well as the corresponding helper functions</p>
+      <td><a href="../../more/index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>More</big></font></a></td>
+    </tr>
+  </table>
 
-<ul>
-<li><tt>not1</tt></li>
-<li><tt>not2</tt></li>
-</ul>
+  <h1>Negators</h1>
 
-<p>However, the negators in this library improve on the standard
-versions in two ways:
+  <p>The header <a href="../../boost/functional.hpp">functional.hpp</a>
+  provides enhanced versions of both the negator adapters from the C++
+  Standard Library (&sect;20.3.5):</p>
 
-<ul>
-<li>They use <a href="function_traits.html">function object traits</a>
-to avoid the need for <tt><nobr>ptr_fun</nobr></tt> when negating a
-function rather than an adaptable function object.
-</li>
-<li>They use Boost <nobr><a
-href="../utility/call_traits.htm">call traits</a></nobr> to determine
-the best way to declare their arguments and pass them through
-to the adapted function (see <a href="#arguments">below</a>).  
-</li>
-</ul>
+  <ul>
+    <li><tt>unary_negate</tt></li>
 
-<h3>Usage</h3>
+    <li><tt>binary_negate</tt></li>
+  </ul>
 
-<p>Usage is identical to the standard negators.  For example,</p>
+  <p>As well as the corresponding helper functions</p>
 
-<blockquote><pre>
-bool bad(const Foo &foo) { ... }
+  <ul>
+    <li><tt>not1</tt></li>
+
+    <li><tt>not2</tt></li>
+  </ul>
+
+  <p>However, the negators in this library improve on the standard versions
+  in two ways:</p>
+
+  <ul>
+    <li>They use <a href="function_traits.html">function object traits</a> to
+    avoid the need for <tt>ptr_fun</tt> when negating a function rather than
+    an adaptable function object.</li>
+
+    <li>They use Boost <a href=
+    "../utility/call_traits.htm">call&nbsp;traits</a> to determine the best
+    way to declare their arguments and pass them through to the adapted
+    function (see <a href="#arguments">below</a>).</li>
+  </ul>
+
+  <h3>Usage</h3>
+
+  <p>Usage is identical to the standard negators. For example,</p>
+
+  <blockquote>
+    <pre>
+bool bad(const Foo &amp;foo) { ... }
 ...
 std::vector&lt;Foo&gt; c;
 ...
 std::find_if(c.begin(), c.end(), boost::not1(bad));
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<h3 id="arguments">Argument Types</h3>
+  <h3 id="arguments">Argument Types</h3>
 
-<p>The C++ Standard <nobr>(&sect;20.3.5)</nobr> defines unary negate
-like this (binary negate is similar):</p>
+  <p>The C++ Standard (&sect;20.3.5) defines unary negate like this (binary
+  negate is similar):</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 template &lt;class Predicate&gt;
   class unary_negate
     : public unary_function&lt;typename Predicate::argument_type,bool&gt; {
 public:
-  explicit unary_negate(const Predicate& pred);
-  bool operator()(<strong>const typename Predicate::argument_type&</strong> x) const;
-};</pre></blockquote>
+  explicit unary_negate(const Predicate&amp; pred);
+  bool operator()(<strong>const typename Predicate::argument_type&amp;</strong> x) const;
+};
+</pre>
+  </blockquote>
 
-<p>Note that if the Predicate's <nobr><tt>argument_type</tt></nobr> is
-a reference, the type of <nobr><tt>operator()</tt>'s</nobr> argument
-would be a reference to a reference.  Currently this is illegal in C++
-(but see the <a
-href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">
-C++ standard core language active issues list</a>).</p>
+  <p>Note that if the Predicate's <tt>argument_type</tt> is a reference, the
+  type of <tt>operator()</tt>'s argument would be a reference to a reference.
+  Currently this is illegal in C++ (but see the <a href=
+  "http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
+  standard core language active issues list</a>).</p>
 
-<p>However, if we instead defined <nobr><tt>operator()</tt></nobr>
-to accept Predicate's argument_type unmodified, this would be
-needlessly inefficient if it were a value type; the argument would be
-copied twice - once when calling <nobr><tt>unary_negate</tt>'s</nobr>
-<nobr><tt>operator()</tt></nobr>, and again when <nobr><tt>operator()</tt></nobr>
-called the adapted function.</p>
+  <p>However, if we instead defined <tt>operator()</tt> to accept Predicate's
+  argument_type unmodified, this would be needlessly inefficient if it were a
+  value type; the argument would be copied twice - once when calling
+  <tt>unary_negate</tt>'s <tt>operator()</tt>, and again when
+  <tt>operator()</tt> called the adapted function.</p>
 
-<p>So how we want to declare the argument for
-<nobr><tt>operator()</tt></nobr> depends on whether or not the
-Predicate's <nobr><tt>argument_type</tt></nobr> is a reference.  If it
-is a reference, we want to declare it simply as
-<nobr><tt>argument_type</tt></nobr>; if it is a value we want to
-declare it as <nobr><tt>const argument_type&</tt></nobr>.
+  <p>So how we want to declare the argument for <tt>operator()</tt> depends
+  on whether or not the Predicate's <tt>argument_type</tt> is a reference. If
+  it is a reference, we want to declare it simply as <tt>argument_type</tt>;
+  if it is a value we want to declare it as
+  <tt>const&nbsp;argument_type&amp;</tt>.</p>
 
-<p>The Boost <nobr><a
-href="../utility/call_traits.htm">call_traits</a></nobr> class
-template contains a <tt><nobr>param_type</nobr></tt> typedef, which
-uses partial specialisation to make precisely this decision.  If we were
-to declare <nobr><tt>operator()</tt></nobr> as</p>
+  <p>The Boost <a href="../utility/call_traits.htm">call_traits</a> class
+  template contains a <tt>param_type</tt> typedef, which uses partial
+  specialisation to make precisely this decision. If we were to declare
+  <tt>operator()</tt> as</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 bool operator()(typename call_traits&lt;typename Predicate::argument_type&gt;::param_type x) const
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>the desired result would be achieved - we would eliminate
-references to references without loss of efficiency.  In fact, the
-actual declaration is slightly more complicated because of the use of
-function object traits, but the effect remains the same.</p>
+  <p>the desired result would be achieved - we would eliminate references to
+  references without loss of efficiency. In fact, the actual declaration is
+  slightly more complicated because of the use of function object traits, but
+  the effect remains the same.</p>
 
-<h3>Limitations</h3>
+  <h3>Limitations</h3>
 
-<p>Both the function object traits and call traits used to realise
-these improvements rely on partial specialisation, these improvements
-are only available on compilers that support that feature.  With other
-compilers, the negators in this library behave very much like those
-in the Standard - <nobr><tt>ptr_fun</tt></nobr> will be required to 
-adapt functions, and references to references will not be avoided.
+  <p>Both the function object traits and call traits used to realise these
+  improvements rely on partial specialisation, these improvements are only
+  available on compilers that support that feature. With other compilers, the
+  negators in this library behave very much like those in the Standard -
+  <tt>ptr_fun</tt> will be required to adapt functions, and references to
+  references will not be avoided.</p>
+  <hr>
 
-<hr>
-<p>Copyright &copy; 2000 Cadenza New Zealand Ltd.  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><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
+  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  height="31" width="88"></a></p>
 
-<p>Revised 28 June 2000</p>
+  <p>Revised 
+  <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->02
+  December, 2006<!--webbot bot="Timestamp" endspan i-checksum="38510" --></p>
 
+  <p><i>Copyright &copy; 2000 Cadenza New Zealand Ltd.</i></p>
+
+  <p><i>Distributed under the Boost Software License, Version 1.0. (See
+  accompanying file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or
+  copy at <a href=
+  "http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)</i></p>
 </body>
 </html>
diff --git a/ptr_fun.html b/ptr_fun.html
index c7a919d..d5b2eb0 100644
--- a/ptr_fun.html
+++ b/ptr_fun.html
@@ -1,135 +1,158 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Boost Function Object Adapter Library</title>
+  <meta http-equiv="Content-Language" content="en-us">
+  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+
+  <title>Boost Function Object Adapter Library</title>
 </head>
 
 <body bgcolor="#FFFFFF" text="#000000">
+  <table border="1" bgcolor="#007F7F" cellpadding="2" summary="">
+    <tr>
+      <td bgcolor="#FFFFFF"><img src="../../boost.png" alt=
+      "boost.png (6897 bytes)" width="277" height="86"></td>
 
-<table border="1" bgcolor="#007F7F" cellpadding="2">
-  <tr>
-    <td bgcolor="#FFFFFF"><img src="../../boost.png" alt="boost.png (6897 bytes)" WIDTH="277" HEIGHT="86"></td>
-    <td><a href="../../index.htm"><font face="Arial" color="#FFFFFF"><big>Home </big></font></a></td>
-    <td><a href="../libraries.htm"><font face="Arial" color="#FFFFFF"><big>Libraries </big></font></a></td>
-    <td><a href="../../people/people.htm"><font face="Arial" color="#FFFFFF"><big>People </big></font></a></td>
-    <td><a href="../../more/faq.htm"><font face="Arial" color="#FFFFFF"><big>FAQ </big></font></a></td>
-    <td><a href="../../more/index.htm"><font face="Arial" color="#FFFFFF"><big>More </big></font></a></td>
-  </tr>
-</table>
+      <td><a href="../../index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Home</big></font></a></td>
 
-<h1>Function Pointer Adapters</h1>
+      <td><a href="../libraries.htm"><font face="Arial" color=
+      "#FFFFFF"><big>Libraries</big></font></a></td>
 
-<p>The header <nobr><a
-href="../../boost/functional.hpp">functional.hpp</a></nobr> provides
-enhanced versions of both the function pointer adapters from the C++
-Standard Library <nobr>(&sect 20.3.7):</nobr></p>
+      <td><a href="../../people/people.htm"><font face="Arial" color=
+      "#FFFFFF"><big>People</big></font></a></td>
 
-<ul>
-<li><tt>pointer_to_unary_function</tt></li>
-<li><tt>pointer_to_binary_function</tt></li>
-</ul>
+      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      "#FFFFFF"><big>FAQ</big></font></a></td>
 
-<p>As well as the corresponding helper function template:</p>
+      <td><a href="../../more/index.htm"><font face="Arial" color=
+      "#FFFFFF"><big>More</big></font></a></td>
+    </tr>
+  </table>
 
-<ul>
-<li><tt>ptr_fun</tt></li>
-</ul>
+  <h1>Function Pointer Adapters</h1>
 
-<p>However, you should not need to use the adapters in conjunction
-with the adapters in this library due to our use of <a
-href="function_traits.html">function object traits</a>.  You will
-however need to use them if your implementation fails to work properly
-with our traits classes (due to lack if partial specialisation), or if
-you wish to use a function object adapter from a third party.
+  <p>The header <a href="../../boost/functional.hpp">functional.hpp</a>
+  provides enhanced versions of both the function pointer adapters from the
+  C++ Standard Library (&sect;20.3.7):</p>
 
-<h3>Usage</h3>
+  <ul>
+    <li><tt>pointer_to_unary_function</tt></li>
 
-<p>If you need to use these adapters, usage is identical to the
-standard function pointer adapters.  For example,</p>
+    <li><tt>pointer_to_binary_function</tt></li>
+  </ul>
 
-<blockquote><pre>
+  <p>As well as the corresponding helper function template:</p>
+
+  <ul>
+    <li><tt>ptr_fun</tt></li>
+  </ul>
+
+  <p>However, you should not need to use the adapters in conjunction with the
+  adapters in this library due to our use of <a href=
+  "function_traits.html">function object traits</a>. You will however need to
+  use them if your implementation fails to work properly with our traits
+  classes (due to lack if partial specialisation), or if you wish to use a
+  function object adapter from a third party.</p>
+
+  <h3>Usage</h3>
+
+  <p>If you need to use these adapters, usage is identical to the standard
+  function pointer adapters. For example,</p>
+
+  <blockquote>
+    <pre>
 bool bad(std::string foo) { ... }
 ...
 std::vector&lt;std::string&gt; c;
 ...
 std::vector&lt;std::string&gt;::iterator it
      = std::find_if(c.begin(), c.end(), std::not1(boost::ptr_fun(bad)));
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>Note however that this library contains enhanced <a
-href="negators.html">negators</a> that support function object traits,
-so the line above could equally be written
+  <p>Note however that this library contains enhanced <a href=
+  "negators.html">negators</a> that support function object traits, so the
+  line above could equally be written</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 std::vector&lt;std::string&gt;::iterator it
      = std::find_if(c.begin(), c.end(), boost::not1(bad));
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<h3>Argument Types</h3>
+  <h3>Argument Types</h3>
 
-<p>The standard defines
-<nobr><tt>pointer_to_unary_function</tt></nobr> like this
-<nobr>(&sect;20.3.8 &para;2):</nobr>
+  <p>The standard defines <tt>pointer_to_unary_function</tt> like this
+  (&sect;20.3.8&nbsp;&para;2):</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 template &lt;class Arg, class Result&gt;
 class pointer_to_unary_function : public unary_function&lt;Arg, Result&gt; {
 public:
   explicit pointer_to_unary_function(Result (* f)(<strong>Arg</strong>));
   Result operator()(<strong>Arg</strong> x) const;
 };
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>Note that the argument to <nobr><tt>operator()</tt></nobr> is
-exactly the same type as the argument to the wrapped function.  If this
-is a value type, the argument will be passed by value and copied twice.
-<nobr><tt>pointer_to_binary_function</tt></nobr> has a similar problem.
+  <p>Note that the argument to <tt>operator()</tt> is exactly the same type
+  as the argument to the wrapped function. If this is a value type, the
+  argument will be passed by value and copied twice.
+  <tt>pointer_to_binary_function</tt> has a similar problem.</p>
 
-<p>However, if we were to try and eliminate this inefficiency by
-instead declaring the argument as <nobr><tt>const Arg&</tt></nobr>, then
-if Arg were a reference type, we would have a reference to a reference,
-which is currently illegal (but see <a
-href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
-core language issue number 106)</a>
+  <p>However, if we were to try and eliminate this inefficiency by instead
+  declaring the argument as <tt>const&nbsp;Arg&amp;</tt>, then if Arg were a
+  reference type, we would have a reference to a reference, which is
+  currently illegal (but see <a href=
+  "http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++ core
+  language issue number 106)</a></p>
 
-<p>So the way in which we want to declare the argument for
-<nobr><tt>operator()</tt></nobr> depends on whether or not the
-wrapped function's argument is a reference.  If it
-is a reference, we want to declare it simply as
-<nobr><tt>Arg</tt></nobr>; if it is a value we want to
-declare it as <nobr><tt>const Arg&</tt></nobr>.
+  <p>So the way in which we want to declare the argument for
+  <tt>operator()</tt> depends on whether or not the wrapped function's
+  argument is a reference. If it is a reference, we want to declare it simply
+  as <tt>Arg</tt>; if it is a value we want to declare it as
+  <tt>const&nbsp;Arg&amp;</tt>.</p>
 
-<p>The Boost <nobr><a
-href="../utility/call_traits.htm">call_traits</a></nobr> class
-template contains a <tt><nobr>param_type</nobr></tt> typedef, which
-uses partial specialisation to make precisely this decision.  By
-declaring the <nobr><tt>operator()</tt></nobr> as
+  <p>The Boost <a href="../utility/call_traits.htm">call_traits</a> class
+  template contains a <tt>param_type</tt> typedef, which uses partial
+  specialisation to make precisely this decision. By declaring the
+  <tt>operator()</tt> as</p>
 
-<blockquote><pre>
+  <blockquote>
+    <pre>
 Result operator()(typename call_traits&lt;Arg&gt;::param_type x) const
-</pre></blockquote>
+</pre>
+  </blockquote>
 
-<p>we achieve the desired result - we improve efficiency without
-generating references to references.</p>
+  <p>we achieve the desired result - we improve efficiency without generating
+  references to references.</p>
 
-<h3>Limitations</h3>
+  <h3>Limitations</h3>
 
-<p>The call traits template used to realise this improvement relies
-on partial specialisation, so this improvement is only available on
-compilers that support that feature.  With other compilers, the
-argument passed to the function will always be passed by
-reference, thus generating the possibility of references to references.
+  <p>The call traits template used to realise this improvement relies on
+  partial specialisation, so this improvement is only available on compilers
+  that support that feature. With other compilers, the argument passed to the
+  function will always be passed by reference, thus generating the
+  possibility of references to references.</p>
+  <hr>
 
-<hr>
+  <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
+  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  height="31" width="88"></a></p>
 
-<p>Copyright &copy; 2000 Cadenza New Zealand Ltd.  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>Revised 
+  <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->02
+  December, 2006<!--webbot bot="Timestamp" endspan i-checksum="38510" --></p>
 
-<p>Revised 28 June 2000</p>
+  <p><i>Copyright &copy; 2000 Cadenza New Zealand Ltd.</i></p>
 
+  <p><i>Distributed under the Boost Software License, Version 1.0. (See
+  accompanying file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or
+  copy at <a href=
+  "http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)</i></p>
 </body>
 </html>

From d63450595504a8b6cfd39ff46fbb474be6aa44da Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 25 Feb 2007 12:15:52 +0000
Subject: [PATCH 017/111] Intel 9.1 with the gcc stdlib seems to segfault on
 call to std::asin and std::acos. So for them I'm disabling that test - it
 isn't vital.

[SVN r37062]
---
 hash/test/hash_float_test.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hash/test/hash_float_test.cpp b/hash/test/hash_float_test.cpp
index 193920a..0bfacbb 100644
--- a/hash/test/hash_float_test.cpp
+++ b/hash/test/hash_float_test.cpp
@@ -125,12 +125,17 @@ void float_tests(char const* name, T* = 0)
     BOOST_TEST(x1(half_max) != x1(three_quarter_max));
     BOOST_TEST(x1(three_quarter_max) == x1(three_quarter_max));
 
+// Intel with gcc stdlib sometimes segfaults on calls to asin and acos.
+#if !((defined(__INTEL_COMPILER) || defined(__ICL) || \
+        defined(__ICC) || defined(__ECC)) && \
+    (defined(__GLIBCPP__) || defined(__GLIBCXX__)))
     T v1 = asin((T) 1);
     T v2 = acos((T) 0);
     if(v1 == v2)
         BOOST_TEST(x1(v1) == x1(v2));
     BOOST_TEST(x1(v1) == HASH_NAMESPACE::hash_value(v1));
     BOOST_TEST(x1(v2) == HASH_NAMESPACE::hash_value(v2));
+#endif
 
     BOOST_TEST(x1(std::numeric_limits<T>::epsilon()) ==
             HASH_NAMESPACE::hash_value(std::numeric_limits<T>::epsilon()));

From 12cc28a847916359df9015f4e338ed63319c3988 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Sun, 25 Feb 2007 15:28:02 +0000
Subject: [PATCH 018/111] Correct testing bugs:

    either changing assert(...) or BOOST_ASSERT(...) to BOOST_TEST
    (in my code only)

    or adding "return boost::report_errors();" where it was clearly
    missing (and a pure bug, in anyone's code).

    or changing BOOST_TEST to BOOST_CHECK where the integer library
    was clearly using Boost.Test and not returning report_errors().


[SVN r37063]
---
 hash/test/link_ext_test.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp
index eeb1160..31adf87 100644
--- a/hash/test/link_ext_test.cpp
+++ b/hash/test/link_ext_test.cpp
@@ -17,6 +17,7 @@ int f(std::size_t hash1, int* x1) {
     std::vector<std::size_t> x;
     x.push_back(*x1);
     HASH_NAMESPACE::hash<std::vector<std::size_t> > vector_hasher;
-    return vector_hasher(x) != HASH_NAMESPACE::hash_value(x);
+    BOOST_TEST(vector_hasher(x) == HASH_NAMESPACE::hash_value(x));
+    return boost::report_errors();
 }
 

From 35f46d5129e958e7667aca5d172308607be17682 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 25 Feb 2007 15:59:08 +0000
Subject: [PATCH 019/111] Reverting the last change as it's not a main function
 so returning 'boost::report_errors' would be wrong. The main function is in
 link_no_ext_test.cpp and does return 'boost::report_errors'.

[SVN r37064]
---
 hash/test/link_ext_test.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp
index 31adf87..eeb1160 100644
--- a/hash/test/link_ext_test.cpp
+++ b/hash/test/link_ext_test.cpp
@@ -17,7 +17,6 @@ int f(std::size_t hash1, int* x1) {
     std::vector<std::size_t> x;
     x.push_back(*x1);
     HASH_NAMESPACE::hash<std::vector<std::size_t> > vector_hasher;
-    BOOST_TEST(vector_hasher(x) == HASH_NAMESPACE::hash_value(x));
-    return boost::report_errors();
+    return vector_hasher(x) != HASH_NAMESPACE::hash_value(x);
 }
 

From 751ef97578864c6a75093ccac4f975fcc1ad6515 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 1 May 2007 21:28:45 +0000
Subject: [PATCH 020/111] Document boost::hash<T*>.

[SVN r37554]
---
 hash/doc/ref.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index f936ac4..4c98870 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -350,6 +350,25 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
         </method>
       </struct-specialization>
 
+      <struct-specialization name="hash">
+        <template>
+          <template-type-parameter name="T"/>
+        </template>
+        <specialization>
+          <template-arg>T*</template-arg>
+        </specialization>
+        <method name="operator()" cv="const">
+          <type>std::size_t</type>
+          <parameter name="val">
+            <paramtype>T*</paramtype>
+          </parameter>
+          <returns>
+            <para>Unspecified in TR1, except that equal arguments yield the same result.</para>
+          </returns>
+          <throws><para>Doesn't throw</para></throws>
+        </method>
+      </struct-specialization>
+
       <!--
         boost::hash_combine
         -->

From 5c5ff11ee020f14fc903fa583fc03095c888cbee Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 15 May 2007 19:44:46 +0000
Subject: [PATCH 021/111] Clean up the 64-bit std::size_t workaround and
 hopefully suppress the warning on 32-bit Visual C++.

[SVN r37694]
---
 include/boost/functional/hash/hash.hpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 251f96d..f7d0f2b 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -1,5 +1,5 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  Copyright Daniel James 2005-2007. 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)
 
@@ -28,6 +28,11 @@
 #include <boost/type_traits/is_const.hpp>
 #endif
 
+#if defined(BOOST_MSVC)
+#   pragma warning(push)
+#   pragma warning(disable:4267)
+#endif
+
 namespace boost
 {
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
@@ -41,12 +46,13 @@ namespace boost
     std::size_t hash_value(long);
     std::size_t hash_value(unsigned long);
 
-#if defined(BOOST_MSVC) && defined(_WIN64)
+#if defined(_M_X64) && defined(_WIN64)
     // On 64-bit windows std::size_t is a typedef for unsigned long long, which
     // isn't due to be supported until Boost 1.35. So add support here.
     // (Technically, Boost.Hash isn't actually documented as supporting
     // std::size_t. But it would be pretty silly not to).
-    std::size_t hash_value(std::size_t);
+    std::size_t hash_value(long long);
+    std::size_t hash_value(unsigned long long);
 #endif
 
 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
@@ -588,5 +594,9 @@ namespace boost
 #endif  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 }
 
+#if defined(BOOST_MSVC)
+#   pragma warning(pop)
+#endif
+
 #endif
 

From f5cef6e65e51e0154c980132c84078d5c644c2fa Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 15 May 2007 19:45:49 +0000
Subject: [PATCH 022/111] Add a missing bracket to the hash copyright
 documentation.

[SVN r37695]
---
 hash/doc/hash.qbk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hash/doc/hash.qbk b/hash/doc/hash.qbk
index 3bab67a..b3d29ab 100644
--- a/hash/doc/hash.qbk
+++ b/hash/doc/hash.qbk
@@ -10,7 +10,7 @@
     [license
         Distributed under 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]
+        [@http://www.boost.org/LICENSE_1_0.txt])
     ]
 ]
 

From d30bf5cb7143c19299e3eb662bea34bfc230f013 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 15 May 2007 19:47:52 +0000
Subject: [PATCH 023/111] Update the date in the hash documentation copyright
 block.

[SVN r37696]
---
 hash/doc/hash.qbk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hash/doc/hash.qbk b/hash/doc/hash.qbk
index b3d29ab..d858f71 100644
--- a/hash/doc/hash.qbk
+++ b/hash/doc/hash.qbk
@@ -1,7 +1,7 @@
 [library Boost.Functional/Hash
     [quickbook 1.3]
     [authors [James, Daniel]]
-    [copyright 2005 2006 Daniel James]
+    [copyright 2005 2007 Daniel James]
     [purpose A TR1 hash function object that can be extended to hash user
         defined types]
     [category higher-order]

From 5af8d5f1b3750933b0acf012578939d9683600a3 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 15 May 2007 19:54:42 +0000
Subject: [PATCH 024/111] Fix a couple of typos in the hash documentation.

[SVN r37697]
---
 hash/doc/tutorial.qbk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index cf17c7a..e30a181 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2006 Daniel James.
+[/ Copyright 2005-2007 Daniel James.
  / Distributed under 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) ]
 
@@ -119,7 +119,7 @@ When writing a hash function, first look at how the equality function works.
 Objects that are equal must generate the same hash value.
 When objects are not equal they should generate different hash values.
 In this object equality was based just on the id so the hash function
-only hash the id. If it was based on the objects name and author
+only hashes the id. If it was based on the object's name and author
 then the hash function should take them into account
 (how to do this is discussed in the next section).
 ]

From ffd0154fb66a83c838523f430d040c587b043d0a Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 15 May 2007 22:05:41 +0000
Subject: [PATCH 025/111] Rolling back changes I shouldn't have checked in.

[SVN r37699]
---
 hash/doc/hash.qbk                      |  4 ++--
 hash/doc/tutorial.qbk                  |  4 ++--
 include/boost/functional/hash/hash.hpp | 16 +++-------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/hash/doc/hash.qbk b/hash/doc/hash.qbk
index d858f71..3bab67a 100644
--- a/hash/doc/hash.qbk
+++ b/hash/doc/hash.qbk
@@ -1,7 +1,7 @@
 [library Boost.Functional/Hash
     [quickbook 1.3]
     [authors [James, Daniel]]
-    [copyright 2005 2007 Daniel James]
+    [copyright 2005 2006 Daniel James]
     [purpose A TR1 hash function object that can be extended to hash user
         defined types]
     [category higher-order]
@@ -10,7 +10,7 @@
     [license
         Distributed under 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])
+        [@http://www.boost.org/LICENSE_1_0.txt]
     ]
 ]
 
diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index e30a181..cf17c7a 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2007 Daniel James.
+[/ Copyright 2005-2006 Daniel James.
  / Distributed under 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) ]
 
@@ -119,7 +119,7 @@ When writing a hash function, first look at how the equality function works.
 Objects that are equal must generate the same hash value.
 When objects are not equal they should generate different hash values.
 In this object equality was based just on the id so the hash function
-only hashes the id. If it was based on the object's name and author
+only hash the id. If it was based on the objects name and author
 then the hash function should take them into account
 (how to do this is discussed in the next section).
 ]
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index f7d0f2b..251f96d 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -1,5 +1,5 @@
 
-//  Copyright Daniel James 2005-2007. Use, modification, and distribution are
+//  Copyright Daniel James 2005-2006. 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)
 
@@ -28,11 +28,6 @@
 #include <boost/type_traits/is_const.hpp>
 #endif
 
-#if defined(BOOST_MSVC)
-#   pragma warning(push)
-#   pragma warning(disable:4267)
-#endif
-
 namespace boost
 {
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
@@ -46,13 +41,12 @@ namespace boost
     std::size_t hash_value(long);
     std::size_t hash_value(unsigned long);
 
-#if defined(_M_X64) && defined(_WIN64)
+#if defined(BOOST_MSVC) && defined(_WIN64)
     // On 64-bit windows std::size_t is a typedef for unsigned long long, which
     // isn't due to be supported until Boost 1.35. So add support here.
     // (Technically, Boost.Hash isn't actually documented as supporting
     // std::size_t. But it would be pretty silly not to).
-    std::size_t hash_value(long long);
-    std::size_t hash_value(unsigned long long);
+    std::size_t hash_value(std::size_t);
 #endif
 
 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
@@ -594,9 +588,5 @@ namespace boost
 #endif  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 }
 
-#if defined(BOOST_MSVC)
-#   pragma warning(pop)
-#endif
-
 #endif
 

From 2cd51443f5080f9bdeafbb5a6b4174e6e1f79253 Mon Sep 17 00:00:00 2001
From: Thomas Witt <witt@acm.org>
Date: Thu, 17 May 2007 23:07:38 +0000
Subject: [PATCH 026/111] Hash warning patch see Trac #952

[SVN r37705]
---
 include/boost/functional/hash/hash.hpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 251f96d..56d36ab 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -1,5 +1,5 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  Copyright Daniel James 2005-2007. 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)
 
@@ -28,6 +28,11 @@
 #include <boost/type_traits/is_const.hpp>
 #endif
 
+#if defined(BOOST_MSVC)
+#   pragma warning(push)
+#   pragma warning(disable:4267)
+#endif
+
 namespace boost
 {
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
@@ -41,12 +46,13 @@ namespace boost
     std::size_t hash_value(long);
     std::size_t hash_value(unsigned long);
 
-#if defined(BOOST_MSVC) && defined(_WIN64)
+#if BOOST_HAS_LONG_LONG && defined(_M_X64) && defined(_WIN64)
     // On 64-bit windows std::size_t is a typedef for unsigned long long, which
     // isn't due to be supported until Boost 1.35. So add support here.
     // (Technically, Boost.Hash isn't actually documented as supporting
     // std::size_t. But it would be pretty silly not to).
-    std::size_t hash_value(std::size_t);
+    std::size_t hash_value(long long);
+    std::size_t hash_value(unsigned long long);
 #endif
 
 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
@@ -116,7 +122,7 @@ namespace boost
         return static_cast<std::size_t>(v);
     }
 
-#if defined(_M_X64) && defined(_WIN64)
+#if BOOST_HAS_LONG_LONG && defined(_M_X64) && defined(_WIN64)
     inline std::size_t hash_value(long long v)
     {
         return v;
@@ -588,5 +594,9 @@ namespace boost
 #endif  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 }
 
+#if defined(BOOST_MSVC)
+#   pragma warning(pop)
+#endif
+
 #endif
 

From a967703ab5c88b8138a5392e4711db8fc8c606ec Mon Sep 17 00:00:00 2001
From: Thomas Witt <witt@acm.org>
Date: Tue, 22 May 2007 03:55:10 +0000
Subject: [PATCH 027/111] Hash warning patch 2 see Trac #952

[SVN r37737]
---
 include/boost/functional/hash/hash.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 56d36ab..993977e 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -46,7 +46,7 @@ namespace boost
     std::size_t hash_value(long);
     std::size_t hash_value(unsigned long);
 
-#if BOOST_HAS_LONG_LONG && defined(_M_X64) && defined(_WIN64)
+#if defined(BOOST_HAS_LONG_LONG) && defined(_M_X64) && defined(_WIN64)
     // On 64-bit windows std::size_t is a typedef for unsigned long long, which
     // isn't due to be supported until Boost 1.35. So add support here.
     // (Technically, Boost.Hash isn't actually documented as supporting
@@ -122,7 +122,7 @@ namespace boost
         return static_cast<std::size_t>(v);
     }
 
-#if BOOST_HAS_LONG_LONG && defined(_M_X64) && defined(_WIN64)
+#if defined(BOOST_HAS_LONG_LONG) && defined(_M_X64) && defined(_WIN64)
     inline std::size_t hash_value(long long v)
     {
         return v;

From f6851b0cf9b1c8701ac40f72f757f088e709f5d3 Mon Sep 17 00:00:00 2001
From: nobody <nobody@localhost>
Date: Tue, 24 Jul 2007 19:28:14 +0000
Subject: [PATCH 028/111] This commit was manufactured by cvs2svn to create tag
 'Version_1_34_1'.

[SVN r38286]
---
 include/boost/functional/hash/deque.hpp  | 21 ---------------------
 include/boost/functional/hash/list.hpp   | 21 ---------------------
 include/boost/functional/hash/map.hpp    | 22 ----------------------
 include/boost/functional/hash/pair.hpp   | 20 --------------------
 include/boost/functional/hash/set.hpp    | 21 ---------------------
 include/boost/functional/hash/vector.hpp | 20 --------------------
 6 files changed, 125 deletions(-)
 delete mode 100644 include/boost/functional/hash/deque.hpp
 delete mode 100644 include/boost/functional/hash/list.hpp
 delete mode 100644 include/boost/functional/hash/map.hpp
 delete mode 100644 include/boost/functional/hash/pair.hpp
 delete mode 100644 include/boost/functional/hash/set.hpp
 delete mode 100644 include/boost/functional/hash/vector.hpp

diff --git a/include/boost/functional/hash/deque.hpp b/include/boost/functional/hash/deque.hpp
deleted file mode 100644
index 0f688cd..0000000
--- a/include/boost/functional/hash/deque.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_DEQUE_HPP)
-#define BOOST_FUNCTIONAL_HASH_DEQUE_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif
-
diff --git a/include/boost/functional/hash/list.hpp b/include/boost/functional/hash/list.hpp
deleted file mode 100644
index f332462..0000000
--- a/include/boost/functional/hash/list.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_LIST_HPP)
-#define BOOST_FUNCTIONAL_HASH_LIST_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif
-
diff --git a/include/boost/functional/hash/map.hpp b/include/boost/functional/hash/map.hpp
deleted file mode 100644
index 10526a1..0000000
--- a/include/boost/functional/hash/map.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_MAP_HPP)
-#define BOOST_FUNCTIONAL_HASH_MAP_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif
-
-
diff --git a/include/boost/functional/hash/pair.hpp b/include/boost/functional/hash/pair.hpp
deleted file mode 100644
index 9c54671..0000000
--- a/include/boost/functional/hash/pair.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_PAIR_HPP)
-#define BOOST_FUNCTIONAL_HASH_PAIR_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif
diff --git a/include/boost/functional/hash/set.hpp b/include/boost/functional/hash/set.hpp
deleted file mode 100644
index 53923e1..0000000
--- a/include/boost/functional/hash/set.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_SET_HPP)
-#define BOOST_FUNCTIONAL_HASH_SET_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif
-
diff --git a/include/boost/functional/hash/vector.hpp b/include/boost/functional/hash/vector.hpp
deleted file mode 100644
index 5a75f8c..0000000
--- a/include/boost/functional/hash/vector.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_VECTOR_HPP)
-#define BOOST_FUNCTIONAL_HASH_VECTOR_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif

From b21e4a5e6badd2798627ab108d76710353a198b1 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Fri, 5 Oct 2007 14:25:06 +0000
Subject: [PATCH 029/111] Starting point for releases

[SVN r39706]

From c2453d69705242309c15b2684b88a062a18a3cc5 Mon Sep 17 00:00:00 2001
From: Douglas Gregor <doug.gregor@gmail.com>
Date: Tue, 23 Oct 2007 01:47:48 +0000
Subject: [PATCH 030/111] Move Attic files back into their rightful places

[SVN r40311]
---
 include/boost/functional/hash/{Attic => }/deque.hpp  | 0
 include/boost/functional/hash/{Attic => }/list.hpp   | 0
 include/boost/functional/hash/{Attic => }/map.hpp    | 0
 include/boost/functional/hash/{Attic => }/pair.hpp   | 0
 include/boost/functional/hash/{Attic => }/set.hpp    | 0
 include/boost/functional/hash/{Attic => }/vector.hpp | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename include/boost/functional/hash/{Attic => }/deque.hpp (100%)
 rename include/boost/functional/hash/{Attic => }/list.hpp (100%)
 rename include/boost/functional/hash/{Attic => }/map.hpp (100%)
 rename include/boost/functional/hash/{Attic => }/pair.hpp (100%)
 rename include/boost/functional/hash/{Attic => }/set.hpp (100%)
 rename include/boost/functional/hash/{Attic => }/vector.hpp (100%)

diff --git a/include/boost/functional/hash/Attic/deque.hpp b/include/boost/functional/hash/deque.hpp
similarity index 100%
rename from include/boost/functional/hash/Attic/deque.hpp
rename to include/boost/functional/hash/deque.hpp
diff --git a/include/boost/functional/hash/Attic/list.hpp b/include/boost/functional/hash/list.hpp
similarity index 100%
rename from include/boost/functional/hash/Attic/list.hpp
rename to include/boost/functional/hash/list.hpp
diff --git a/include/boost/functional/hash/Attic/map.hpp b/include/boost/functional/hash/map.hpp
similarity index 100%
rename from include/boost/functional/hash/Attic/map.hpp
rename to include/boost/functional/hash/map.hpp
diff --git a/include/boost/functional/hash/Attic/pair.hpp b/include/boost/functional/hash/pair.hpp
similarity index 100%
rename from include/boost/functional/hash/Attic/pair.hpp
rename to include/boost/functional/hash/pair.hpp
diff --git a/include/boost/functional/hash/Attic/set.hpp b/include/boost/functional/hash/set.hpp
similarity index 100%
rename from include/boost/functional/hash/Attic/set.hpp
rename to include/boost/functional/hash/set.hpp
diff --git a/include/boost/functional/hash/Attic/vector.hpp b/include/boost/functional/hash/vector.hpp
similarity index 100%
rename from include/boost/functional/hash/Attic/vector.hpp
rename to include/boost/functional/hash/vector.hpp

From 0f24897958736c83b75b3c28078660582bb13be3 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Sun, 25 Nov 2007 18:07:19 +0000
Subject: [PATCH 031/111] Full merge from trunk at revision 41356 of entire
 boost-root tree.

[SVN r41369]
---
 .../boost/functional/detail/container_fwd.hpp |   6 +-
 .../functional/detail/float_functions.hpp     |   6 +-
 .../boost/functional/detail/hash_float.hpp    | 115 ++++++++++---
 include/boost/functional/hash.hpp             |   6 +-
 include/boost/functional/hash/deque.hpp       |  14 +-
 include/boost/functional/hash/hash.hpp        | 155 ++++++++++++++----
 include/boost/functional/hash/list.hpp        |  14 +-
 include/boost/functional/hash/map.hpp         |  15 +-
 include/boost/functional/hash/pair.hpp        |  13 +-
 include/boost/functional/hash/set.hpp         |  14 +-
 include/boost/functional/hash/vector.hpp      |  13 +-
 include/boost/functional/hash_fwd.hpp         |   6 +-
 12 files changed, 283 insertions(+), 94 deletions(-)

diff --git a/include/boost/functional/detail/container_fwd.hpp b/include/boost/functional/detail/container_fwd.hpp
index d30bef3..f3f82f2 100644
--- a/include/boost/functional/detail/container_fwd.hpp
+++ b/include/boost/functional/detail/container_fwd.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #if !defined(BOOST_DETAIL_CONTAINER_FWD_HPP)
 #define BOOST_DETAIL_CONTAINER_FWD_HPP
diff --git a/include/boost/functional/detail/float_functions.hpp b/include/boost/functional/detail/float_functions.hpp
index 34b8251..9aac5a2 100644
--- a/include/boost/functional/detail/float_functions.hpp
+++ b/include/boost/functional/detail/float_functions.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #if !defined(BOOST_FUNCTIONAL_DETAIL_FLOAT_FUNCTIONS_HPP)
 #define BOOST_FUNCTIONAL_DETAIL_FLOAT_FUNCTIONS_HPP
diff --git a/include/boost/functional/detail/hash_float.hpp b/include/boost/functional/detail/hash_float.hpp
index 07d19c3..d005e7d 100644
--- a/include/boost/functional/detail/hash_float.hpp
+++ b/include/boost/functional/detail/hash_float.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
@@ -15,24 +15,40 @@
 #endif
 
 #include <boost/functional/detail/float_functions.hpp>
+#include <boost/integer/static_log2.hpp>
+#include <boost/cstdint.hpp>
 #include <boost/limits.hpp>
 #include <boost/assert.hpp>
-#include <errno.h>
 
-// Don't use fpclassify or _fpclass for stlport.
-#if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
-#  if defined(__GLIBCPP__) || defined(__GLIBCXX__)
-// GNU libstdc++ 3
-#    if (defined(__USE_ISOC99) || defined(_GLIBCXX_USE_C99_MATH)) && \
-        !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__))
-#      define BOOST_HASH_USE_FPCLASSIFY
-#    endif
-#  elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-// Dinkumware Library, on Visual C++ 
-#    if defined(BOOST_MSVC)
-#      define BOOST_HASH_USE_FPCLASS
-#    endif
+// Select implementation for the current platform.
+
+// Cygwn
+#if defined(__CYGWIN__)
+#  if defined(__i386__) || defined(_M_IX86)
+#    define BOOST_HASH_USE_x86_BINARY_HASH
 #  endif
+
+// STLport
+#elif defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
+// _fpclass and fpclassify aren't good enough on STLport.
+
+// GNU libstdc++ 3
+#elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
+#  if (defined(__USE_ISOC99) || defined(_GLIBCXX_USE_C99_MATH)) && \
+      !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__))
+#    define BOOST_HASH_USE_FPCLASSIFY
+#  endif
+
+// Dinkumware Library, on Visual C++ 
+#elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
+
+// Not using _fpclass because it causes a warning about a conversion
+// from 'long double' to 'double'. Pity.
+// 
+//#  if defined(BOOST_MSVC)
+//#    define BOOST_HASH_USE_FPCLASS
+//#  endif
+
 #endif
 
 namespace boost
@@ -44,25 +60,69 @@ namespace boost
             seed ^= value + (seed<<6) + (seed>>2);
         }
 
+// A simple, non-portable hash algorithm for x86.
+#if defined(BOOST_HASH_USE_x86_BINARY_HASH)
+        inline std::size_t float_hash_impl(float v)
+        {
+            boost::uint32_t* ptr = (boost::uint32_t*)&v;
+            std::size_t seed = *ptr;
+            return seed;
+        }
+
+        inline std::size_t float_hash_impl(double v)
+        {
+            boost::uint32_t* ptr = (boost::uint32_t*)&v;
+            std::size_t seed = *ptr++;
+            hash_float_combine(seed, *ptr);
+            return seed;
+        }
+
+        inline std::size_t float_hash_impl(long double v)
+        {
+            boost::uint32_t* ptr = (boost::uint32_t*)&v;
+            std::size_t seed = *ptr++;
+            hash_float_combine(seed, *ptr++);
+            hash_float_combine(seed, *(boost::uint16_t*)ptr);
+            return seed;
+        }
+
+#else
+
         template <class T>
         inline std::size_t float_hash_impl(T v)
         {
             int exp = 0;
-            errno = 0;
+
             v = boost::hash_detail::call_frexp(v, &exp);
-            if(errno) return 0;
 
-            std::size_t seed = 0;
+            // A postive value is easier to hash, so combine the
+            // sign with the exponent.
+            if(v < 0) {
+                v = -v;
+                exp += std::numeric_limits<T>::max_exponent -
+                    std::numeric_limits<T>::min_exponent;
+            }
 
+            // The result of frexp is always between 0.5 and 1, so its
+            // top bit will always be 1. Subtract by 0.5 to remove that.
+            v -= T(0.5);
+            v = boost::hash_detail::call_ldexp(v,
+                    std::numeric_limits<std::size_t>::digits + 1);
+            std::size_t seed = static_cast<std::size_t>(v);
+            v -= seed;
+
+            // ceiling(digits(T) * log2(radix(T))/ digits(size_t)) - 1;
             std::size_t const length
-                = (std::numeric_limits<T>::digits +
-                        std::numeric_limits<int>::digits - 1)
-                / std::numeric_limits<int>::digits;
+                = (std::numeric_limits<T>::digits *
+                        boost::static_log2<std::numeric_limits<T>::radix>::value
+                        - 1)
+                / std::numeric_limits<std::size_t>::digits;
 
-            for(std::size_t i = 0; i < length; ++i)
+            for(std::size_t i = 0; i != length; ++i)
             {
-                v = boost::hash_detail::call_ldexp(v, std::numeric_limits<int>::digits);
-                int const part = static_cast<int>(v);
+                v = boost::hash_detail::call_ldexp(v,
+                        std::numeric_limits<std::size_t>::digits);
+                std::size_t part = static_cast<std::size_t>(v);
                 v -= part;
                 hash_float_combine(seed, part);
             }
@@ -71,6 +131,7 @@ namespace boost
 
             return seed;
         }
+#endif
 
         template <class T>
         inline std::size_t float_hash_value(T v)
@@ -114,7 +175,7 @@ namespace boost
                 return 0;
             }
 #else
-            return float_hash_impl(v);
+            return v == 0 ? 0 : float_hash_impl(v);
 #endif
         }
     }
diff --git a/include/boost/functional/hash.hpp b/include/boost/functional/hash.hpp
index 65e19b1..60b2608 100644
--- a/include/boost/functional/hash.hpp
+++ b/include/boost/functional/hash.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/deque.hpp b/include/boost/functional/hash/deque.hpp
index 0f688cd..8e92727 100644
--- a/include/boost/functional/hash/deque.hpp
+++ b/include/boost/functional/hash/deque.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
@@ -14,8 +14,14 @@
 # pragma once
 #endif
 
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+#pragma message("Warning: boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead.")
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead."
+#endif
+
 #include <boost/functional/hash.hpp>
 
 #endif
-
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 993977e..5515efd 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2007. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
@@ -28,29 +28,24 @@
 #include <boost/type_traits/is_const.hpp>
 #endif
 
-#if defined(BOOST_MSVC)
-#   pragma warning(push)
-#   pragma warning(disable:4267)
-#endif
-
 namespace boost
 {
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
-    // Borland complains about an ambiguous function overload
-    // when compiling boost::hash<bool>.
     std::size_t hash_value(bool);
-#endif
-    
+    std::size_t hash_value(char);
+    std::size_t hash_value(unsigned char);
+    std::size_t hash_value(signed char);
+    std::size_t hash_value(short);
+    std::size_t hash_value(unsigned short);
     std::size_t hash_value(int);
     std::size_t hash_value(unsigned int);
     std::size_t hash_value(long);
     std::size_t hash_value(unsigned long);
 
-#if defined(BOOST_HAS_LONG_LONG) && defined(_M_X64) && defined(_WIN64)
-    // On 64-bit windows std::size_t is a typedef for unsigned long long, which
-    // isn't due to be supported until Boost 1.35. So add support here.
-    // (Technically, Boost.Hash isn't actually documented as supporting
-    // std::size_t. But it would be pretty silly not to).
+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
+    std::size_t hash_value(wchar_t);
+#endif
+    
+#if defined(BOOST_HAS_LONG_LONG)
     std::size_t hash_value(long long);
     std::size_t hash_value(unsigned long long);
 #endif
@@ -93,14 +88,84 @@ namespace boost
     template <class K, class T, class C, class A>
     std::size_t hash_value(std::multimap<K, T, C, A> const& v);
 
+    template <class T>
+    std::size_t hash_value(std::complex<T> const&);
+
     // Implementation
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+    namespace hash_detail
+    {
+        template <class T>
+        inline std::size_t hash_value_signed(T val)
+        {
+             const int size_t_bits = std::numeric_limits<std::size_t>::digits;
+             // ceiling(std::numeric_limits<T>::digits / size_t_bits) - 1
+             const int length = (std::numeric_limits<T>::digits - 1)
+                 / size_t_bits;
+
+             std::size_t seed = 0;
+             T positive = val < 0 ? -1 - val : val;
+
+             // Hopefully, this loop can be unrolled.
+             for(unsigned int i = length * size_t_bits; i > 0; i -= size_t_bits)
+             {
+                 seed ^= (std::size_t) (positive >> i) + (seed<<6) + (seed>>2);
+             }
+             seed ^= (std::size_t) val + (seed<<6) + (seed>>2);
+
+             return seed;
+        }
+
+        template <class T>
+        inline std::size_t hash_value_unsigned(T val)
+        {
+             const int size_t_bits = std::numeric_limits<std::size_t>::digits;
+             // ceiling(std::numeric_limits<T>::digits / size_t_bits) - 1
+             const int length = (std::numeric_limits<T>::digits - 1)
+                 / size_t_bits;
+
+             std::size_t seed = 0;
+
+             // Hopefully, this loop can be unrolled.
+             for(unsigned int i = length * size_t_bits; i > 0; i -= size_t_bits)
+             {
+                 seed ^= (std::size_t) (val >> i) + (seed<<6) + (seed>>2);
+             }
+             seed ^= (std::size_t) val + (seed<<6) + (seed>>2);
+
+             return seed;
+        }
+    }
+
     inline std::size_t hash_value(bool v)
     {
         return static_cast<std::size_t>(v);
     }
-#endif
+
+    inline std::size_t hash_value(char v)
+    {
+        return static_cast<std::size_t>(v);
+    }
+
+    inline std::size_t hash_value(unsigned char v)
+    {
+        return static_cast<std::size_t>(v);
+    }
+
+    inline std::size_t hash_value(signed char v)
+    {
+        return static_cast<std::size_t>(v);
+    }
+
+    inline std::size_t hash_value(short v)
+    {
+        return static_cast<std::size_t>(v);
+    }
+
+    inline std::size_t hash_value(unsigned short v)
+    {
+        return static_cast<std::size_t>(v);
+    }
 
     inline std::size_t hash_value(int v)
     {
@@ -122,15 +187,22 @@ namespace boost
         return static_cast<std::size_t>(v);
     }
 
-#if defined(BOOST_HAS_LONG_LONG) && defined(_M_X64) && defined(_WIN64)
+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
+    inline std::size_t hash_value(wchar_t v)
+    {
+        return static_cast<std::size_t>(v);
+    }
+#endif
+
+#if defined(BOOST_HAS_LONG_LONG)
     inline std::size_t hash_value(long long v)
     {
-        return v;
+        return hash_detail::hash_value_signed(v);
     }
 
     inline std::size_t hash_value(unsigned long long v)
     {
-        return v;
+        return hash_detail::hash_value_unsigned(v);
     }
 #endif
 
@@ -143,6 +215,7 @@ namespace boost
     {
         std::size_t x = static_cast<std::size_t>(
            reinterpret_cast<std::ptrdiff_t>(v));
+
         return x + (x >> 3);
     }
 
@@ -292,6 +365,15 @@ namespace boost
         return hash_range(v.begin(), v.end());
     }
 
+    template <class T>
+    std::size_t hash_value(std::complex<T> const& v)
+    {
+        boost::hash<T> hasher;
+        std::size_t seed = hasher(v.imag());
+        seed ^= hasher(v.real()) + (seed<<6) + (seed>>2);
+        return seed;
+    }
+
     //
     // boost::hash
     //
@@ -387,10 +469,17 @@ namespace boost
     struct hash<T*>
         : public std::unary_function<T*, std::size_t>
     {
-        std::size_t operator()(T* v) const \
-        { \
-            return boost::hash_value(v); \
-        } \
+        std::size_t operator()(T* v) const
+        {
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x590)
+            return boost::hash_value(v);
+#else
+            std::size_t x = static_cast<std::size_t>(
+                reinterpret_cast<std::ptrdiff_t>(v));
+
+            return x + (x >> 3);
+#endif
+        }
     };
 #else
     namespace hash_detail
@@ -407,7 +496,14 @@ namespace boost
             {
                 std::size_t operator()(T val) const
                 {
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 590)
                     return boost::hash_value(val);
+#else
+                    std::size_t x = static_cast<std::size_t>(
+                        reinterpret_cast<std::ptrdiff_t>(val));
+
+                    return x + (x >> 3);
+#endif
                 }
             };
         };
@@ -422,7 +518,6 @@ namespace boost
 }
 
 #endif // BOOST_FUNCTIONAL_HASH_HASH_HPP
-
 ////////////////////////////////////////////////////////////////////////////////
 
 #if !defined(BOOST_HASH_NO_EXTENSIONS) \
@@ -594,9 +689,5 @@ namespace boost
 #endif  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 }
 
-#if defined(BOOST_MSVC)
-#   pragma warning(pop)
-#endif
-
 #endif
 
diff --git a/include/boost/functional/hash/list.hpp b/include/boost/functional/hash/list.hpp
index f332462..219394b 100644
--- a/include/boost/functional/hash/list.hpp
+++ b/include/boost/functional/hash/list.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
@@ -14,8 +14,14 @@
 # pragma once
 #endif
 
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+#pragma message("Warning: boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead.")
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead."
+#endif
+
 #include <boost/functional/hash.hpp>
 
 #endif
-
diff --git a/include/boost/functional/hash/map.hpp b/include/boost/functional/hash/map.hpp
index 10526a1..59e259f 100644
--- a/include/boost/functional/hash/map.hpp
+++ b/include/boost/functional/hash/map.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
@@ -14,9 +14,14 @@
 # pragma once
 #endif
 
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+#pragma message("Warning: boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead.")
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead."
+#endif
+
 #include <boost/functional/hash.hpp>
 
 #endif
-
-
diff --git a/include/boost/functional/hash/pair.hpp b/include/boost/functional/hash/pair.hpp
index 9c54671..68f2233 100644
--- a/include/boost/functional/hash/pair.hpp
+++ b/include/boost/functional/hash/pair.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
@@ -14,7 +14,14 @@
 # pragma once
 #endif
 
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+#pragma message("Warning: boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead.")
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead."
+#endif
+
 #include <boost/functional/hash.hpp>
 
 #endif
diff --git a/include/boost/functional/hash/set.hpp b/include/boost/functional/hash/set.hpp
index 53923e1..6e3ef71 100644
--- a/include/boost/functional/hash/set.hpp
+++ b/include/boost/functional/hash/set.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
@@ -14,8 +14,14 @@
 # pragma once
 #endif
 
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+#pragma message("Warning: boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead.")
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead."
+#endif
+
 #include <boost/functional/hash.hpp>
 
 #endif
-
diff --git a/include/boost/functional/hash/vector.hpp b/include/boost/functional/hash/vector.hpp
index 5a75f8c..eeadf4e 100644
--- a/include/boost/functional/hash/vector.hpp
+++ b/include/boost/functional/hash/vector.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
@@ -14,7 +14,14 @@
 # pragma once
 #endif
 
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+#pragma message("Warning: boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead.")
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead."
+#endif
+
 #include <boost/functional/hash.hpp>
 
 #endif
diff --git a/include/boost/functional/hash_fwd.hpp b/include/boost/functional/hash_fwd.hpp
index dcbe659..4d103f7 100644
--- a/include/boost/functional/hash_fwd.hpp
+++ b/include/boost/functional/hash_fwd.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf

From 50f1ab8c4aae0a3091f0ef792f7d961fef857626 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Sun, 25 Nov 2007 18:38:02 +0000
Subject: [PATCH 032/111] Full merge from trunk at revision 41356 of entire
 boost-root tree.

[SVN r41370]
---
 function_test.cpp                        |   3 -
 hash/doc/Jamfile.v2                      |   4 +-
 hash/doc/changes.qbk                     |   2 +-
 hash/doc/disable.qbk                     |   2 +-
 hash/doc/hash.qbk                        |   6 +-
 hash/doc/intro.qbk                       |   2 +-
 hash/doc/links.qbk                       |  20 +--
 hash/doc/portability.qbk                 |   4 +-
 hash/doc/ref.xml                         | 108 ++++++++++-
 hash/doc/thanks.qbk                      |  15 +-
 hash/doc/tutorial.qbk                    |   4 +-
 hash/examples/books.cpp                  |   6 +-
 hash/examples/books.hpp                  |   6 +-
 hash/examples/point.cpp                  |   6 +-
 hash/examples/portable.cpp               |   6 +-
 hash/index.html                          |   2 +-
 hash/test/Jamfile.v2                     |  11 +-
 hash/test/compile_time.hpp               |   8 +-
 hash/test/config.hpp                     |   6 +-
 hash/test/container_fwd_test.cpp         |   6 +-
 hash/test/hash_built_in_array_test.cpp   |   6 +-
 hash/test/hash_complex_test.cpp          | 108 +++++++++++
 hash/test/hash_custom_test.cpp           |   6 +-
 hash/test/hash_deprecated_headers.cpp    |  26 +++
 hash/test/hash_deque_test.cpp            |   6 +-
 hash/test/hash_float_test.cpp            | 220 +----------------------
 hash/test/hash_float_test.hpp            | 208 +++++++++++++++++++++
 hash/test/hash_friend_test.cpp           |   6 +-
 hash/test/hash_function_pointer_test.cpp |   6 +-
 hash/test/hash_fwd_test.hpp              |   6 +-
 hash/test/hash_fwd_test_1.cpp            |   6 +-
 hash/test/hash_fwd_test_2.cpp            |   6 +-
 hash/test/hash_global_namespace_test.cpp |   8 +-
 hash/test/hash_list_test.cpp             |   6 +-
 hash/test/hash_long_double_test.cpp      |  17 ++
 hash/test/hash_map_test.cpp              |   6 +-
 hash/test/hash_map_test.hpp              |  15 +-
 hash/test/hash_no_ext_fail_test.cpp      |   6 +-
 hash/test/hash_no_ext_macro_1.cpp        |   6 +-
 hash/test/hash_no_ext_macro_2.cpp        |   6 +-
 hash/test/hash_number_test.cpp           |  45 ++++-
 hash/test/hash_pointer_test.cpp          |   6 +-
 hash/test/hash_range_test.cpp            |   6 +-
 hash/test/hash_sequence_test.hpp         |  15 +-
 hash/test/hash_set_test.cpp              |   6 +-
 hash/test/hash_set_test.hpp              |  22 ++-
 hash/test/hash_string_test.cpp           |   6 +-
 hash/test/hash_value_array_test.cpp      |   6 +-
 hash/test/hash_vector_test.cpp           |   6 +-
 hash/test/link_ext_test.cpp              |   6 +-
 hash/test/link_no_ext_test.cpp           |   6 +-
 hash/test/link_test.cpp                  |   6 +-
 hash/test/link_test_2.cpp                |   6 +-
 53 files changed, 682 insertions(+), 367 deletions(-)
 create mode 100644 hash/test/hash_complex_test.cpp
 create mode 100644 hash/test/hash_deprecated_headers.cpp
 create mode 100644 hash/test/hash_float_test.hpp
 create mode 100644 hash/test/hash_long_double_test.cpp

diff --git a/function_test.cpp b/function_test.cpp
index ed7eb8d..318a750 100644
--- a/function_test.cpp
+++ b/function_test.cpp
@@ -12,9 +12,6 @@
 // $Id$
 // ------------------------------------------------------------------------------
 // $Log$
-// Revision 1.2.24.1  2006/12/02 14:17:26  andreas_huber69
-// Merged L & C issue fixes from trunk to branch.
-//
 // Revision 1.3  2006/12/02 13:57:32  andreas_huber69
 // Fixed license & copyright issues.
 //
diff --git a/hash/doc/Jamfile.v2 b/hash/doc/Jamfile.v2
index 7f55cd5..9b7bdb7 100644
--- a/hash/doc/Jamfile.v2
+++ b/hash/doc/Jamfile.v2
@@ -1,6 +1,6 @@
 
-# Copyright Daniel James 2005. Use, modification, and distribution are
-# subject to the Boost Software License, Version 1.0. (See accompanying
+# Copyright 2005 Daniel James.
+# Distributed under 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)
 
 using quickbook ;
diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index c8f8046..4a15288 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2006 Daniel James.
+[/ Copyright 2005-2007 Daniel James.
  / Distributed under 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) ]
 
diff --git a/hash/doc/disable.qbk b/hash/doc/disable.qbk
index 62b4d31..3d69431 100644
--- a/hash/doc/disable.qbk
+++ b/hash/doc/disable.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2006 Daniel James.
+[/ Copyright 2005-2007 Daniel James.
  / Distributed under 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) ]
 
diff --git a/hash/doc/hash.qbk b/hash/doc/hash.qbk
index 3bab67a..5bb200a 100644
--- a/hash/doc/hash.qbk
+++ b/hash/doc/hash.qbk
@@ -1,7 +1,7 @@
 [library Boost.Functional/Hash
-    [quickbook 1.3]
+    [quickbook 1.4]
     [authors [James, Daniel]]
-    [copyright 2005 2006 Daniel James]
+    [copyright 2005 2006 2007 Daniel James]
     [purpose A TR1 hash function object that can be extended to hash user
         defined types]
     [category higher-order]
@@ -10,7 +10,7 @@
     [license
         Distributed under 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]
+        [@http://www.boost.org/LICENSE_1_0.txt])
     ]
 ]
 
diff --git a/hash/doc/intro.qbk b/hash/doc/intro.qbk
index a4f3be3..b6dac9e 100644
--- a/hash/doc/intro.qbk
+++ b/hash/doc/intro.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2006 Daniel James.
+[/ Copyright 2005-2007 Daniel James.
  / Distributed under 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) ]
 
diff --git a/hash/doc/links.qbk b/hash/doc/links.qbk
index 4217f5f..5d9a269 100644
--- a/hash/doc/links.qbk
+++ b/hash/doc/links.qbk
@@ -1,26 +1,26 @@
 
-[/ Copyright 2005-2006 Daniel James.
+[/ Copyright 2005-2007 Daniel James.
  / Distributed under 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) ]
 
 [section:links Links]
 
-[*A Proposal to Add Hash Tables to the Standard Library]\n
-[@http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2003/n1456.html]\n
+[*A Proposal to Add Hash Tables to the Standard Library]
+[@http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2003/n1456.html]
 The hash table proposal explains much of the design. The hash function object
 is discussed in Section D.
 
-[*The C++ Standard Library Technical Report.]\n
-[@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf]\n
+[*The C++ Standard Library Technical Report.]
+[@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf]
 Contains the hash function specification in section 6.3.2.
 
-[*Library Extension Technical Report Issues List.]\n
-[@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1837.pdf]\n
+[*Library Extension Technical Report Issues List.]
+[@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1837.pdf]
 The library implements the extension described in Issue 6.18, pages 63-67.
 
-[*Methods for Identifying Versioned and Plagiarised Documents]\n
-Timothy C. Hoad, Justin Zobel\n
-[@http://www.cs.rmit.edu.au/~jz/fulltext/jasist-tch.pdf]\n
+[*Methods for Identifying Versioned and Plagiarised Documents]
+Timothy C. Hoad, Justin Zobel
+[@http://www.cs.rmit.edu.au/~jz/fulltext/jasist-tch.pdf]
 Contains the hash function that [funcref boost::hash_combine] is based on.
 
 [endsect]
diff --git a/hash/doc/portability.qbk b/hash/doc/portability.qbk
index 6c20799..0e89196 100644
--- a/hash/doc/portability.qbk
+++ b/hash/doc/portability.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2006 Daniel James.
+[/ Copyright 2005-2007 Daniel James.
  / Distributed under 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) ]
 
@@ -10,7 +10,7 @@
 __boost_hash__ is written to be as portable as possible, but unfortunately, several
 older compilers don't support argument dependent lookup (ADL) - the mechanism
 used for customisation.  On those compilers custom overloads for `hash_value`
-need to be declared in the boost namespace.
+needs to be declared in the boost namespace.
 
 On a strictly standards compliant compiler, an overload defined in the
 boost namespace won't be found when __boost_hash__ is instantiated,
diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index 4c98870..21acd4a 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -1,5 +1,6 @@
+
 <!--
-Copyright 2005-2006 Daniel James.
+Copyright Daniel James 2005-2007
 Distributed under 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)
 -->
@@ -260,6 +261,42 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
         </method>
       </struct-specialization>
 
+      <struct-specialization name="hash">
+        <template></template>
+        <specialization>
+          <template-arg>long long</template-arg>
+        </specialization>
+        <method name="operator()" cv="const">
+          <type>std::size_t</type>
+          <parameter name="val">
+            <paramtype>long long</paramtype>
+          </parameter>
+          <returns>
+            <para>Unspecified in TR1, except that equal arguments yield the same result.</para>
+            <para><functionname>hash_value</functionname>(val) in Boost.</para>
+          </returns>
+          <throws><para>Doesn't throw</para></throws>
+        </method>
+      </struct-specialization>
+
+      <struct-specialization name="hash">
+        <template></template>
+        <specialization>
+          <template-arg>unsigned long long</template-arg>
+        </specialization>
+        <method name="operator()" cv="const">
+          <type>std::size_t</type>
+          <parameter name="val">
+            <paramtype>unsigned long long</paramtype>
+          </parameter>
+          <returns>
+            <para>Unspecified in TR1, except that equal arguments yield the same result.</para>
+            <para><functionname>hash_value</functionname>(val) in Boost.</para>
+          </returns>
+          <throws><para>Doesn't throw</para></throws>
+        </method>
+      </struct-specialization>
+
       <struct-specialization name="hash">
         <template></template>
         <specialization>
@@ -472,6 +509,41 @@ for(; first != last; ++first)
             Implementation of the hash function.
         </purpose>
 
+        <signature>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>bool</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>char</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>signed char</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>unsigned char</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>wchar_t</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>short</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>unsigned short</paramtype></parameter>
+        </signature>
+
         <signature>
           <type>std::size_t</type>
           <parameter name="val"><paramtype>int</paramtype></parameter>
@@ -492,6 +564,16 @@ for(; first != last; ++first)
           <parameter name="val"><paramtype>unsigned long</paramtype></parameter>
         </signature>
 
+        <signature>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>long long</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>unsigned long long</paramtype></parameter>
+        </signature>
+
         <signature>
           <type>std::size_t</type>
           <parameter name="val"><paramtype>float</paramtype></parameter>
@@ -620,6 +702,14 @@ for(; first != last; ++first)
           <parameter name="val"><paramtype>std::multimap&lt;K, T, C, A&gt; const&amp;</paramtype></parameter>
         </signature>
 
+        <signature>
+          <template>
+            <template-type-parameter name="T"/>
+          </template>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::complex&lt;T&gt; const&amp;</paramtype></parameter>
+        </signature>
+
         <description><para>
           Generally shouldn't be called directly by users, instead they should use
           <classname>boost::hash</classname>, <functionname>boost::hash_range</functionname>
@@ -650,9 +740,17 @@ for(; first != last; ++first)
               </thead>
               <tbody>
                 <row>
-                  <entry><code>int</code>, <code>unsigned int</code>, <code>long</code>, <code>unsigned long</code></entry>
+                  <entry><code>bool</code>,
+                    <code>char</code>, <code>signed char</code>, <code>unsigned char</code>, <code>wchar_t</code>,
+                    <code>short</code>, <code>unsigned short</code>,
+                    <code>int</code>, <code>unsigned int</code>, <code>long</code>, <code>unsigned long</code>
+                  </entry>
                   <entry><code>val</code></entry>
                 </row>
+                <row>
+                  <entry><code>long long</code>, <code>unsigned long long</code></entry>
+                  <entry><code>val</code> when <code>abs(val) &lt;= std::numeric_limits&lt;std::size_t&gt;::max()</code>.</entry>
+                </row>
                 <row>
                   <entry><code>float</code>, <code>double</code>, <code>long double</code></entry>
                   <entry>An unspecified value, except that equal arguments shall yield the same result.</entry>
@@ -688,6 +786,12 @@ for(; first != last; ++first)
 <functionname>hash_combine</functionname>(seed, val.second);
 return seed;</programlisting></entry>
                 </row>
+                <row>
+                  <entry>
+                    <code>std::complex&lt;T&gt;</code>
+                  </entry>
+                  <entry>When <code>T</code> is a built in type and <code>val.imag() == 0</code>, the result is equal to <code>hash_value(val.real())</code>. Otherwise an unspecified value, except that equal arguments shall yield the same result.</entry>
+                </row>
               </tbody>
             </tgroup>
           </informaltable>
diff --git a/hash/doc/thanks.qbk b/hash/doc/thanks.qbk
index 1b67c71..27bffc1 100644
--- a/hash/doc/thanks.qbk
+++ b/hash/doc/thanks.qbk
@@ -1,20 +1,19 @@
 
-[/ Copyright 2005-2006 Daniel James.
+[/ Copyright 2005-2007 Daniel James.
  / Distributed under 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) ]
 
 [section:acknowledgements Acknowledgements]
 
-This library is based on the design by Peter Dimov's original design.
-
-During the initial development Joaquín M López Muñoz made many useful
-suggestions, contributed fixes.
+This library is based on the design by Peter Dimov. During the initial
+development
+Joaquín M López Muñoz made many useful suggestions and contributed fixes.
 
 The formal review was managed by Thorsten Ottosen, and the library reviewed by:
 David Abrahams, Alberto Barbati, Topher Cooper, Caleb Epstein, Dave Harris,
-Chris Jefferson, Bronek Kozicki, John Maddock, Tobias Swinger, Jaap Suter, Rob
-Stewart and Pavel Vozenilek. Since then, there have been further contributions
-from Daniel Krügler, Alexander Nasonov, 沈慧峰 and John Maddock.
+Chris Jefferson, Bronek Kozicki, John Maddock, Tobias Swinger, Jaap Suter,
+Rob Stewart and Pavel Vozenilek. Since then, further constructive criticism has
+been made by Daniel Krügler, Alexander Nasonov and 沈慧峰.
 
 The implementation of the hash function for pointers is based on suggestions
 made by Alberto Barbati and Dave Harris. Dave Harris also suggested an
diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index cf17c7a..e30a181 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2006 Daniel James.
+[/ Copyright 2005-2007 Daniel James.
  / Distributed under 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) ]
 
@@ -119,7 +119,7 @@ When writing a hash function, first look at how the equality function works.
 Objects that are equal must generate the same hash value.
 When objects are not equal they should generate different hash values.
 In this object equality was based just on the id so the hash function
-only hash the id. If it was based on the objects name and author
+only hashes the id. If it was based on the object's name and author
 then the hash function should take them into account
 (how to do this is discussed in the next section).
 ]
diff --git a/hash/examples/books.cpp b/hash/examples/books.cpp
index 4c31ff1..466ff44 100644
--- a/hash/examples/books.cpp
+++ b/hash/examples/books.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./books.hpp"
 #include <boost/functional/hash.hpp>
diff --git a/hash/examples/books.hpp b/hash/examples/books.hpp
index 774dab2..4acdd86 100644
--- a/hash/examples/books.hpp
+++ b/hash/examples/books.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 // This example illustrates how to use boost::hash with a custom hash function.
 // The implementation is contained in books.cpp
diff --git a/hash/examples/point.cpp b/hash/examples/point.cpp
index 4beb93d..6943342 100644
--- a/hash/examples/point.cpp
+++ b/hash/examples/point.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005. 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)
+// Copyright 2005 Daniel James.
+// Distributed under 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)
 
 #include <boost/functional/hash.hpp>
 #include <cassert>
diff --git a/hash/examples/portable.cpp b/hash/examples/portable.cpp
index ddb9220..962dca2 100644
--- a/hash/examples/portable.cpp
+++ b/hash/examples/portable.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include <boost/functional/hash.hpp>
 #include <cassert>
diff --git a/hash/index.html b/hash/index.html
index b76ca08..12b5757 100644
--- a/hash/index.html
+++ b/hash/index.html
@@ -1,6 +1,6 @@
 
 <!--
-Copyright 2005-2006 Daniel James.
+Copyright 2005-2007 Daniel James.
 Distributed under 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)
 -->
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 45caa60..b0ac974 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -1,13 +1,15 @@
 
-#  Copyright Daniel James 2005-2006. 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)
+# Copyright 2005-2007 Daniel James.
+# Distributed under 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)
 
 import testing ;
 
 project hash-tests
     : requirements
         <toolset>gcc:<define>_GLIBCXX_DEBUG
+        <toolset>gcc:<cxxflags>-Wsign-promo
+        #<toolset>gcc:<cxxflags>-Wextra
     ;
 
 test-suite functional/hash
@@ -18,6 +20,7 @@ test-suite functional/hash
         [ run hash_pointer_test.cpp ]
         [ run hash_function_pointer_test.cpp ]
         [ run hash_float_test.cpp : : : <test-info>always_show_run_output ]
+        [ run hash_long_double_test.cpp : : : <test-info>always_show_run_output ]
         [ run hash_string_test.cpp ]
         [ run hash_range_test.cpp ]
         [ run hash_custom_test.cpp ]
@@ -30,12 +33,14 @@ test-suite functional/hash
         [ run hash_deque_test.cpp ]
         [ run hash_set_test.cpp ]
         [ run hash_map_test.cpp ]
+        [ run hash_complex_test.cpp ]
         [ run link_test.cpp link_test_2.cpp ]
         [ run link_ext_test.cpp link_no_ext_test.cpp ]
         [ run container_fwd_test.cpp ]
         [ compile-fail hash_no_ext_fail_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
         [ run hash_no_ext_macro_2.cpp ]
+        [ run hash_deprecated_headers.cpp : : : <test-info>always_show_run_output ]
     ;
 
 build-project ../examples ;
diff --git a/hash/test/compile_time.hpp b/hash/test/compile_time.hpp
index 25ba441..99589d1 100644
--- a/hash/test/compile_time.hpp
+++ b/hash/test/compile_time.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include <boost/config.hpp>
 #include <boost/static_assert.hpp>
@@ -12,5 +12,5 @@ void compile_time_tests(T*)
 {
     BOOST_STATIC_ASSERT((boost::is_base_and_derived<
         std::unary_function<T, std::size_t>, HASH_NAMESPACE::hash<T> >::value));
-};
+}
 
diff --git a/hash/test/config.hpp b/hash/test/config.hpp
index 1f3739f..12d9aca 100644
--- a/hash/test/config.hpp
+++ b/hash/test/config.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #if defined(TEST_STD)
 #  define TEST_STD_INCLUDES
diff --git a/hash/test/container_fwd_test.cpp b/hash/test/container_fwd_test.cpp
index 684e16b..232c357 100644
--- a/hash/test/container_fwd_test.cpp
+++ b/hash/test/container_fwd_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include <boost/functional/detail/container_fwd.hpp>
 
diff --git a/hash/test/hash_built_in_array_test.cpp b/hash/test/hash_built_in_array_test.cpp
index f7789d1..5904615 100644
--- a/hash/test/hash_built_in_array_test.cpp
+++ b/hash/test/hash_built_in_array_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
new file mode 100644
index 0000000..a0707b5
--- /dev/null
+++ b/hash/test/hash_complex_test.cpp
@@ -0,0 +1,108 @@
+
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
+
+#include "./config.hpp"
+
+#ifdef TEST_EXTENSIONS
+#  ifdef TEST_STD_INCLUDES
+#    include <functional>
+#  else
+#    include <boost/functional/hash.hpp>
+#  endif
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
+
+#ifdef TEST_EXTENSIONS
+
+#include <complex>
+#include <sstream>
+#include <boost/limits.hpp>
+
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#pragma warning(disable:4244) // conversion from 'unsigned long' to 'unsigned short', possible loss of data
+#pragma warning(disable:4512) // assignment operator could not be generated
+#endif
+
+#include <boost/random/mersenne_twister.hpp>
+#include <boost/random/uniform_int.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/variate_generator.hpp>
+
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
+template <class T>
+void generic_complex_tests(std::complex<T> v)
+{
+    HASH_NAMESPACE::hash<std::complex<T> > complex_hasher;
+
+    BOOST_TEST(complex_hasher(v) == complex_hasher(v));
+
+    HASH_NAMESPACE::hash<T> real_hasher;
+    T real = v.real();
+    T imag = v.imag();
+
+    BOOST_TEST(real_hasher(real) == complex_hasher(std::complex<T>(real)));
+
+    if(imag != 0 && real_hasher(real) == complex_hasher(v)) {
+        std::ostringstream os;
+        os<<"real_hasher("<<real<<") == complex_hasher("
+            <<v.real()<<" + "<<v.imag()<<"i) == "
+            <<real_hasher(real)<<" (This might not be a bug).";
+        BOOST_ERROR(os.str().c_str());
+    }
+}
+
+template <class Float>
+void complex_float_tests(Float*)
+{
+    boost::mt19937 rng;
+    boost::uniform_real<Float> uniform;
+    boost::variate_generator<boost::mt19937&, boost::uniform_real<Float> >
+        uniform_generator(rng, uniform);
+
+    for(int i = 0; i < 100; ++i)
+    {
+        std::complex<Float> v(uniform_generator(), uniform_generator());
+        generic_complex_tests(v);
+    }
+}
+
+template <class Integer>
+void complex_integral_tests(Integer*)
+{
+    boost::mt19937 rng;
+    boost::uniform_int<Integer> uniform(
+            (std::numeric_limits<Integer>::min)(),
+            (std::numeric_limits<Integer>::max)());
+    boost::variate_generator<boost::mt19937&, boost::uniform_int<Integer> >
+        uniform_generator(rng, uniform);
+
+    for(int i = 0; i < 100; ++i)
+    {
+        std::complex<Integer>v(uniform_generator(), uniform_generator());
+        generic_complex_tests(v);
+    }
+}
+
+int main()
+{
+    complex_float_tests((float*) 0);
+    complex_float_tests((double*) 0);
+    complex_float_tests((long double*) 0);
+    complex_integral_tests((short*) 0);
+    complex_integral_tests((int*) 0);
+    complex_integral_tests((long*) 0);
+    complex_integral_tests((unsigned short*) 0);
+    complex_integral_tests((unsigned int*) 0);
+    complex_integral_tests((unsigned long*) 0);
+
+    return boost::report_errors();
+}
+
+#endif
diff --git a/hash/test/hash_custom_test.cpp b/hash/test/hash_custom_test.cpp
index 1af95f8..8df3e83 100644
--- a/hash/test/hash_custom_test.cpp
+++ b/hash/test/hash_custom_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include <boost/config.hpp>
 #include <cstddef>
diff --git a/hash/test/hash_deprecated_headers.cpp b/hash/test/hash_deprecated_headers.cpp
new file mode 100644
index 0000000..3257d9b
--- /dev/null
+++ b/hash/test/hash_deprecated_headers.cpp
@@ -0,0 +1,26 @@
+
+// Copyright 2007 Daniel James.
+// Distributed under 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)
+
+// All these headers are meant output a warning, but not cause the compilation
+// to fail.
+
+#include <boost/functional/hash/deque.hpp>
+#include <boost/functional/hash/list.hpp>
+#include <boost/functional/hash/map.hpp>
+#include <boost/functional/hash/pair.hpp>
+#include <boost/functional/hash/set.hpp>
+#include <boost/functional/hash/vector.hpp>
+
+// And a quick check that the hash library was included.
+// Strictly speaking I should do this once for each header
+// but that would just be wasting the testing resources.
+
+#include <vector>
+
+int main() {
+    std::vector<int> v;
+    boost::hash<std::vector<int> > x;
+    x(v);
+}
diff --git a/hash/test/hash_deque_test.cpp b/hash/test/hash_deque_test.cpp
index 9994a92..7238319 100644
--- a/hash/test/hash_deque_test.cpp
+++ b/hash/test/hash_deque_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_float_test.cpp b/hash/test/hash_float_test.cpp
index 0bfacbb..6ceda4b 100644
--- a/hash/test/hash_float_test.cpp
+++ b/hash/test/hash_float_test.cpp
@@ -1,228 +1,18 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
-#include "./config.hpp"
+#include "hash_float_test.hpp"
 
-#ifdef TEST_STD_INCLUDES
-#  include <functional>
-#else
-#  include <boost/functional/hash.hpp>
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-#include <cmath>
-#include <boost/limits.hpp>
-
-#include <iostream>
-
-template <class T>
-void float_tests(char const* name, T* = 0)
-{
-    std::cerr<<"\n"
-        <<"Testing " BOOST_STRINGIZE(HASH_NAMESPACE) "::hash<"<<name<<">\n"
-        <<"\n"
-        <<"std::numeric_limits<T>::digits = "
-            <<std::numeric_limits<T>::digits<<"\n"
-        <<"std::numeric_limits<int>::digits = "
-            <<std::numeric_limits<int>::digits<<"\n"
-        <<"std::numeric_limits<std::size_t>::digits = "
-            <<std::numeric_limits<std::size_t>::digits<<"\n"
-        <<"\n"
-        ;
-
-    HASH_NAMESPACE::hash<T> x1;
-
-    T zero = 0;
-    T minus_zero = (T) -1 * zero;
-
-    BOOST_TEST(zero == minus_zero);
-    BOOST_TEST(x1(zero) == x1(minus_zero));
-
-    BOOST_TEST(x1(zero) == HASH_NAMESPACE::hash_value(zero));
-    BOOST_TEST(x1(minus_zero) == HASH_NAMESPACE::hash_value(minus_zero));
-
-    using namespace std;
-
-// Doing anything with infinity causes borland to crash.
-#if defined(__BORLANDC__)
-    std::cerr<<"Not running infinity checks on Borland, as it causes it to crash.\n";
-#else
-    if(std::numeric_limits<T>::has_infinity) {
-        T infinity = -log(zero);
-        T infinity2 = (T) 1. / zero;
-        T infinity3 = (T) -1. / minus_zero;
-        T infinity4 = std::numeric_limits<T>::infinity();
-
-        T minus_infinity = log(zero);
-        T minus_infinity2 = (T) -1. / zero;
-        T minus_infinity3 = (T) 1. / minus_zero;
-
-        BOOST_TEST(x1(infinity) == HASH_NAMESPACE::hash_value(infinity));
-        BOOST_TEST(x1(minus_infinity)
-                == HASH_NAMESPACE::hash_value(minus_infinity));
-
-        if(infinity == infinity2)
-            BOOST_TEST(x1(infinity) == x1(infinity2));
-        if(infinity == infinity3);
-            BOOST_TEST(x1(infinity) == x1(infinity3));
-        if(infinity == infinity4)
-            BOOST_TEST(x1(infinity) == x1(infinity4));
-
-        if(minus_infinity == minus_infinity2)
-            BOOST_TEST(x1(minus_infinity) == x1(minus_infinity2));
-        if(minus_infinity == minus_infinity3)
-            BOOST_TEST(x1(minus_infinity) == x1(minus_infinity3));
-
-        BOOST_TEST(infinity != minus_infinity);
-
-        if(x1(infinity) == x1(minus_infinity)) {
-            std::cerr<<"x1(infinity) == x1(-infinity) == "<<x1(infinity)<<"\n";
-        }
-
-        // This should really be 'has_denorm == denorm_present' but some
-        // compilers don't have 'denorm_present'. See also a later use.
-        if(std::numeric_limits<T>::has_denorm) {
-            if(x1(std::numeric_limits<T>::denorm_min()) == x1(infinity)) {
-                std::cerr<<"x1(denorm_min) == x1(infinity) == "<<x1(infinity)<<"\n";
-            }
-            if(x1(std::numeric_limits<T>::denorm_min()) == x1(minus_infinity)) {
-                std::cerr<<"x1(denorm_min) == x1(-infinity) == "<<x1(minus_infinity)<<"\n";
-            }
-        }
-        if(std::numeric_limits<T>::has_quiet_NaN) {
-            if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(infinity)) {
-                std::cerr<<"x1(quiet_NaN) == x1(infinity) == "<<x1(infinity)<<"\n";
-            }
-            if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(minus_infinity)) {
-                std::cerr<<"x1(quiet_NaN) == x1(-infinity) == "<<x1(minus_infinity)<<"\n";
-            }
-        }
-    }
-#endif
-
-    T max = (std::numeric_limits<T>::max)();
-    T half_max = max / 2;
-    T quarter_max = max / 4;
-    T three_quarter_max = max - quarter_max;
-
-    BOOST_TEST(x1(max) == HASH_NAMESPACE::hash_value(max));
-    BOOST_TEST(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
-    BOOST_TEST(x1(quarter_max) == HASH_NAMESPACE::hash_value(quarter_max));
-    BOOST_TEST(x1(three_quarter_max) == HASH_NAMESPACE::hash_value(three_quarter_max));
-
-    // The '!=' tests could legitimately fail, but with my hash it indicates a bug.
-    BOOST_TEST(x1(max) == x1(max));
-    BOOST_TEST(x1(max) != x1(quarter_max));
-    BOOST_TEST(x1(max) != x1(half_max));
-    BOOST_TEST(x1(max) != x1(three_quarter_max));
-    BOOST_TEST(x1(quarter_max) == x1(quarter_max));
-    BOOST_TEST(x1(quarter_max) != x1(half_max));
-    BOOST_TEST(x1(quarter_max) != x1(three_quarter_max));
-    BOOST_TEST(x1(half_max) == x1(half_max));
-    BOOST_TEST(x1(half_max) != x1(three_quarter_max));
-    BOOST_TEST(x1(three_quarter_max) == x1(three_quarter_max));
-
-// Intel with gcc stdlib sometimes segfaults on calls to asin and acos.
-#if !((defined(__INTEL_COMPILER) || defined(__ICL) || \
-        defined(__ICC) || defined(__ECC)) && \
-    (defined(__GLIBCPP__) || defined(__GLIBCXX__)))
-    T v1 = asin((T) 1);
-    T v2 = acos((T) 0);
-    if(v1 == v2)
-        BOOST_TEST(x1(v1) == x1(v2));
-    BOOST_TEST(x1(v1) == HASH_NAMESPACE::hash_value(v1));
-    BOOST_TEST(x1(v2) == HASH_NAMESPACE::hash_value(v2));
-#endif
-
-    BOOST_TEST(x1(std::numeric_limits<T>::epsilon()) ==
-            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::epsilon()));
-
-    BOOST_TEST(std::numeric_limits<T>::epsilon() != (T) 0);
-    if(x1(std::numeric_limits<T>::epsilon()) == x1((T) 0))
-        std::cerr<<"x1(epsilon) == x1(0) == "<<x1((T) 0)<<"\n";
-
-    BOOST_TEST(-std::numeric_limits<T>::epsilon() != (T) 0);
-    if(x1(-std::numeric_limits<T>::epsilon()) == x1((T) 0))
-        std::cerr<<"x1(-epsilon) == x1(0) == "<<x1((T) 0)<<"\n";
-
-    BOOST_TEST((T) 1 + std::numeric_limits<T>::epsilon() != (T) 1);
-    if(x1((T) 1 + std::numeric_limits<T>::epsilon()) == x1((T) 1))
-        std::cerr<<"x1(1 + epsilon) == x1(1) == "<<x1((T) 1)<<"\n";
-
-    BOOST_TEST((T) 1 - std::numeric_limits<T>::epsilon() != (T) 1);
-    if(x1((T) 1 - std::numeric_limits<T>::epsilon()) == x1((T) 1))
-        std::cerr<<"x1(1 - epsilon) == x1(1) == "<<x1((T) 1)<<"\n";
-
-    BOOST_TEST((T) -1 + std::numeric_limits<T>::epsilon() != (T) -1);
-    if(x1((T) -1 + std::numeric_limits<T>::epsilon()) == x1((T) -1))
-        std::cerr<<"x1(-1 + epsilon) == x1(-1) == "<<x1((T) -1)<<"\n";
-
-    BOOST_TEST((T) -1 - std::numeric_limits<T>::epsilon() != (T) -1);
-    if(x1((T) -1 - std::numeric_limits<T>::epsilon()) == x1((T) -1))
-        std::cerr<<"x1(-1 - epsilon) == x1(-1) == "<<x1((T) -1)<<"\n";
-
-    // As before.
-    if(std::numeric_limits<T>::has_denorm) {
-        if(x1(std::numeric_limits<T>::denorm_min()) == x1(zero)) {
-            std::cerr<<"x1(denorm_min) == x1(zero) == "<<x1(zero)<<"\n";
-        }
-#if !BOOST_WORKAROUND(__DECCXX_VER,<70190006)
-        // The Tru64/CXX standard library prior to 7.1 contains a bug in the
-        // specialization of std::numeric_limits::denorm_min() for long
-        // doubles which causes this test to fail.
-        if(x1(std::numeric_limits<T>::denorm_min()) !=
-            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::denorm_min()))
-        {
-            std::cerr<<"x1(std::numeric_limits<T>::denorm_min()) = "
-                << x1(std::numeric_limits<T>::denorm_min())
-                << "\nhash_value(std::numeric_limits<T>::denorm_min()) = "
-                << HASH_NAMESPACE::hash_value(
-                        std::numeric_limits<T>::denorm_min())
-                << "\nx1(0) = "<<x1(0)<<"\n";
-        }
-#endif
-    }
-
-// NaN also causes borland to crash.
-#if !defined(__BORLANDC__)
-    if(std::numeric_limits<T>::has_quiet_NaN) {
-        if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(1.0)) {
-            std::cerr<<"x1(quiet_NaN) == x1(1.0) == "<<x1(1.0)<<"\n";
-        }
-        BOOST_TEST(x1(std::numeric_limits<T>::quiet_NaN()) ==
-            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::quiet_NaN()));
-    }
-#endif
-}
-
-void hash_float_tests()
+int main()
 {
     std::cerr<<"Compiler: "<<BOOST_COMPILER<<"\n";
     std::cerr<<"Platform: "<<BOOST_PLATFORM<<"\n";
     std::cerr<<"Library: "<<BOOST_STDLIB<<"\n\n";
 
     float_tests("float", (float*) 0);
-}
-
-void hash_double_tests()
-{
     float_tests("double", (double*) 0);
-}
-
-void hash_long_double_tests()
-{
-    float_tests("long double", (long double*) 0);
-}
-
-int main()
-{
-    hash_float_tests();
-    hash_double_tests();
-    hash_long_double_tests();
 
     return boost::report_errors();
 }
-
diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
new file mode 100644
index 0000000..2fda7b8
--- /dev/null
+++ b/hash/test/hash_float_test.hpp
@@ -0,0 +1,208 @@
+
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
+
+#include "./config.hpp"
+
+#ifdef TEST_STD_INCLUDES
+#  include <functional>
+#else
+#  include <boost/functional/hash.hpp>
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
+
+#include <cmath>
+#include <boost/limits.hpp>
+
+#include <iostream>
+
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#pragma warning(disable:4127) // conditional expression is constant
+#endif
+
+template <class T>
+void float_tests(char const* name, T* = 0)
+{
+    std::cerr<<"\n"
+        <<"Testing " BOOST_STRINGIZE(HASH_NAMESPACE) "::hash<"<<name<<">\n"
+        <<"\n"
+        <<"std::numeric_limits<T>::digits = "
+            <<std::numeric_limits<T>::digits<<"\n"
+        <<"std::numeric_limits<int>::digits = "
+            <<std::numeric_limits<int>::digits<<"\n"
+        <<"std::numeric_limits<std::size_t>::digits = "
+            <<std::numeric_limits<std::size_t>::digits<<"\n"
+        <<"\n"
+        ;
+
+    HASH_NAMESPACE::hash<T> x1;
+
+    T zero = 0;
+    T minus_zero = (T) -1 * zero;
+
+    BOOST_TEST(zero == minus_zero);
+    BOOST_TEST(x1(zero) == x1(minus_zero));
+
+    BOOST_TEST(x1(zero) == HASH_NAMESPACE::hash_value(zero));
+    BOOST_TEST(x1(minus_zero) == HASH_NAMESPACE::hash_value(minus_zero));
+
+    using namespace std;
+
+// Doing anything with infinity causes borland to crash.
+#if defined(__BORLANDC__)
+    std::cerr<<"Not running infinity checks on Borland, as it causes it to crash.\n";
+#else
+    if(std::numeric_limits<T>::has_infinity) {
+        T infinity = -log(zero);
+        T infinity2 = (T) 1. / zero;
+        T infinity3 = (T) -1. / minus_zero;
+        T infinity4 = std::numeric_limits<T>::infinity();
+
+        T minus_infinity = log(zero);
+        T minus_infinity2 = (T) -1. / zero;
+        T minus_infinity3 = (T) 1. / minus_zero;
+
+        BOOST_TEST(x1(infinity) == HASH_NAMESPACE::hash_value(infinity));
+        BOOST_TEST(x1(minus_infinity)
+                == HASH_NAMESPACE::hash_value(minus_infinity));
+
+        if(infinity == infinity2)
+            BOOST_TEST(x1(infinity) == x1(infinity2));
+        if(infinity == infinity3)
+            BOOST_TEST(x1(infinity) == x1(infinity3));
+        if(infinity == infinity4)
+            BOOST_TEST(x1(infinity) == x1(infinity4));
+
+        if(minus_infinity == minus_infinity2)
+            BOOST_TEST(x1(minus_infinity) == x1(minus_infinity2));
+        if(minus_infinity == minus_infinity3)
+            BOOST_TEST(x1(minus_infinity) == x1(minus_infinity3));
+
+        BOOST_TEST(infinity != minus_infinity);
+
+        if(x1(infinity) == x1(minus_infinity)) {
+            std::cerr<<"x1(infinity) == x1(-infinity) == "<<x1(infinity)<<"\n";
+        }
+
+        // This should really be 'has_denorm == denorm_present' but some
+        // compilers don't have 'denorm_present'. See also a later use.
+        if(std::numeric_limits<T>::has_denorm) {
+            if(x1(std::numeric_limits<T>::denorm_min()) == x1(infinity)) {
+                std::cerr<<"x1(denorm_min) == x1(infinity) == "<<x1(infinity)<<"\n";
+            }
+            if(x1(std::numeric_limits<T>::denorm_min()) == x1(minus_infinity)) {
+                std::cerr<<"x1(denorm_min) == x1(-infinity) == "<<x1(minus_infinity)<<"\n";
+            }
+        }
+        if(std::numeric_limits<T>::has_quiet_NaN) {
+            if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(infinity)) {
+                std::cerr<<"x1(quiet_NaN) == x1(infinity) == "<<x1(infinity)<<"\n";
+            }
+            if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(minus_infinity)) {
+                std::cerr<<"x1(quiet_NaN) == x1(-infinity) == "<<x1(minus_infinity)<<"\n";
+            }
+        }
+    }
+#endif
+
+    T max = (std::numeric_limits<T>::max)();
+    T half_max = max / 2;
+    T quarter_max = max / 4;
+    T three_quarter_max = max - quarter_max;
+
+    BOOST_TEST(x1(max) == HASH_NAMESPACE::hash_value(max));
+    BOOST_TEST(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
+    BOOST_TEST(x1(quarter_max) == HASH_NAMESPACE::hash_value(quarter_max));
+    BOOST_TEST(x1(three_quarter_max) == HASH_NAMESPACE::hash_value(three_quarter_max));
+
+    // The '!=' tests could legitimately fail, but with my hash it indicates a bug.
+    BOOST_TEST(x1(max) == x1(max));
+    BOOST_TEST(x1(max) != x1(quarter_max));
+    BOOST_TEST(x1(max) != x1(half_max));
+    BOOST_TEST(x1(max) != x1(three_quarter_max));
+    BOOST_TEST(x1(quarter_max) == x1(quarter_max));
+    BOOST_TEST(x1(quarter_max) != x1(half_max));
+    BOOST_TEST(x1(quarter_max) != x1(three_quarter_max));
+    BOOST_TEST(x1(half_max) == x1(half_max));
+    BOOST_TEST(x1(half_max) != x1(three_quarter_max));
+    BOOST_TEST(x1(three_quarter_max) == x1(three_quarter_max));
+
+// Intel with gcc stdlib sometimes segfaults on calls to asin and acos.
+#if !((defined(__INTEL_COMPILER) || defined(__ICL) || \
+        defined(__ICC) || defined(__ECC)) && \
+    (defined(__GLIBCPP__) || defined(__GLIBCXX__)))
+    T v1 = asin((T) 1);
+    T v2 = acos((T) 0);
+    if(v1 == v2)
+        BOOST_TEST(x1(v1) == x1(v2));
+    BOOST_TEST(x1(v1) == HASH_NAMESPACE::hash_value(v1));
+    BOOST_TEST(x1(v2) == HASH_NAMESPACE::hash_value(v2));
+#endif
+
+    BOOST_TEST(x1(std::numeric_limits<T>::epsilon()) ==
+            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::epsilon()));
+
+    BOOST_TEST(std::numeric_limits<T>::epsilon() != (T) 0);
+    if(x1(std::numeric_limits<T>::epsilon()) == x1((T) 0))
+        std::cerr<<"x1(epsilon) == x1(0) == "<<x1((T) 0)<<"\n";
+
+    BOOST_TEST(-std::numeric_limits<T>::epsilon() != (T) 0);
+    if(x1(-std::numeric_limits<T>::epsilon()) == x1((T) 0))
+        std::cerr<<"x1(-epsilon) == x1(0) == "<<x1((T) 0)<<"\n";
+
+    BOOST_TEST((T) 1 + std::numeric_limits<T>::epsilon() != (T) 1);
+    if(x1((T) 1 + std::numeric_limits<T>::epsilon()) == x1((T) 1))
+        std::cerr<<"x1(1 + epsilon) == x1(1) == "<<x1((T) 1)<<"\n";
+
+    BOOST_TEST((T) 1 - std::numeric_limits<T>::epsilon() != (T) 1);
+    if(x1((T) 1 - std::numeric_limits<T>::epsilon()) == x1((T) 1))
+        std::cerr<<"x1(1 - epsilon) == x1(1) == "<<x1((T) 1)<<"\n";
+
+    BOOST_TEST((T) -1 + std::numeric_limits<T>::epsilon() != (T) -1);
+    if(x1((T) -1 + std::numeric_limits<T>::epsilon()) == x1((T) -1))
+        std::cerr<<"x1(-1 + epsilon) == x1(-1) == "<<x1((T) -1)<<"\n";
+
+    BOOST_TEST((T) -1 - std::numeric_limits<T>::epsilon() != (T) -1);
+    if(x1((T) -1 - std::numeric_limits<T>::epsilon()) == x1((T) -1))
+        std::cerr<<"x1(-1 - epsilon) == x1(-1) == "<<x1((T) -1)<<"\n";
+
+    // As before.
+    if(std::numeric_limits<T>::has_denorm) {
+        if(x1(std::numeric_limits<T>::denorm_min()) == x1(zero)) {
+            std::cerr<<"x1(denorm_min) == x1(zero) == "<<x1(zero)<<"\n";
+        }
+#if !BOOST_WORKAROUND(__DECCXX_VER,<70190006)
+        // The Tru64/CXX standard library prior to 7.1 contains a bug in the
+        // specialization of std::numeric_limits::denorm_min() for long
+        // doubles which causes this test to fail.
+        if(x1(std::numeric_limits<T>::denorm_min()) !=
+            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::denorm_min()))
+        {
+            std::cerr<<"x1(std::numeric_limits<T>::denorm_min()) = "
+                << x1(std::numeric_limits<T>::denorm_min())
+                << "\nhash_value(std::numeric_limits<T>::denorm_min()) = "
+                << HASH_NAMESPACE::hash_value(
+                        std::numeric_limits<T>::denorm_min())
+                << "\nx1(0) = "<<x1(0)<<"\n";
+        }
+#endif
+    }
+
+// NaN also causes borland to crash.
+#if !defined(__BORLANDC__)
+    if(std::numeric_limits<T>::has_quiet_NaN) {
+        if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(1.0)) {
+            std::cerr<<"x1(quiet_NaN) == x1(1.0) == "<<x1(1.0)<<"\n";
+        }
+        BOOST_TEST(x1(std::numeric_limits<T>::quiet_NaN()) ==
+            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::quiet_NaN()));
+    }
+#endif
+}
+
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
diff --git a/hash/test/hash_friend_test.cpp b/hash/test/hash_friend_test.cpp
index 362a9cb..6c6596e 100644
--- a/hash/test/hash_friend_test.cpp
+++ b/hash/test/hash_friend_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. 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)
+// Copyright 2006-2007 Daniel James.
+// Distributed under 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)
 
 #include <boost/config.hpp>
 #include <cstddef>
diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp
index 92c8769..07a0300 100644
--- a/hash/test/hash_function_pointer_test.cpp
+++ b/hash/test/hash_function_pointer_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_fwd_test.hpp b/hash/test/hash_fwd_test.hpp
index 017b85d..30ad609 100644
--- a/hash/test/hash_fwd_test.hpp
+++ b/hash/test/hash_fwd_test.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. 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)
+// Copyright 2006-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_fwd_test_1.cpp b/hash/test/hash_fwd_test_1.cpp
index 9d401ec..e5106a3 100644
--- a/hash/test/hash_fwd_test_1.cpp
+++ b/hash/test/hash_fwd_test_1.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. 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)
+// Copyright 2006-2007 Daniel James.
+// Distributed under 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)
 
 // This checks that template code implemented using hash_fwd will work.
 
diff --git a/hash/test/hash_fwd_test_2.cpp b/hash/test/hash_fwd_test_2.cpp
index d29569b..e334194 100644
--- a/hash/test/hash_fwd_test_2.cpp
+++ b/hash/test/hash_fwd_test_2.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. 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)
+// Copyright 2006-2007 Daniel James.
+// Distributed under 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)
 
 // This test just makes sure a header which uses hash_fwd can compile without
 // the main hash headers.
diff --git a/hash/test/hash_global_namespace_test.cpp b/hash/test/hash_global_namespace_test.cpp
index fa84d49..a64f5eb 100644
--- a/hash/test/hash_global_namespace_test.cpp
+++ b/hash/test/hash_global_namespace_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. 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)
+// Copyright 2006-2007 Daniel James.
+// Distributed under 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)
 
 // This test demonstrates an ADL bug in Borland 5.5 where ADL isn't performed
 // in the global namespace.
@@ -44,7 +44,7 @@ namespace boost
 #  ifdef TEST_STD_INCLUDES
 #    include <functional>
 #  else
-#    include <boost/functional/hash/hash.hpp>
+#    include <boost/functional/hash.hpp>
 #  endif
 #endif
 
diff --git a/hash/test/hash_list_test.cpp b/hash/test/hash_list_test.cpp
index f6df2ad..f61b6c4 100644
--- a/hash/test/hash_list_test.cpp
+++ b/hash/test/hash_list_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_long_double_test.cpp b/hash/test/hash_long_double_test.cpp
new file mode 100644
index 0000000..1c3aa74
--- /dev/null
+++ b/hash/test/hash_long_double_test.cpp
@@ -0,0 +1,17 @@
+
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
+
+#include "hash_float_test.hpp"
+
+int main()
+{
+    std::cerr<<"Compiler: "<<BOOST_COMPILER<<"\n";
+    std::cerr<<"Platform: "<<BOOST_PLATFORM<<"\n";
+    std::cerr<<"Library: "<<BOOST_STDLIB<<"\n\n";
+
+    float_tests("long double", (long double*) 0);
+
+    return boost::report_errors();
+}
diff --git a/hash/test/hash_map_test.cpp b/hash/test/hash_map_test.cpp
index 6c15499..cbc9c50 100644
--- a/hash/test/hash_map_test.cpp
+++ b/hash/test/hash_map_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp
index 7ab13ea..1a56282 100644
--- a/hash/test/hash_map_test.hpp
+++ b/hash/test/hash_map_test.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #if !defined(CONTAINER_TYPE)
 #error "CONTAINER_TYPE not defined"
@@ -9,6 +9,11 @@
 
 #include <boost/preprocessor/cat.hpp>
 
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#pragma warning(disable:4245) // signed/unsigned mismatch
+#endif
+
 namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
 {
     template <class T>
@@ -60,5 +65,9 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
     }
 }
 
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
 #undef CONTAINER_TYPE
 #endif
diff --git a/hash/test/hash_no_ext_fail_test.cpp b/hash/test/hash_no_ext_fail_test.cpp
index 597473a..bd123a9 100644
--- a/hash/test/hash_no_ext_fail_test.cpp
+++ b/hash/test/hash_no_ext_fail_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. 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)
+// Copyright 2006-2007 Daniel James.
+// Distributed under 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)
 
 #define HASH_NAMESPACE boost
 
diff --git a/hash/test/hash_no_ext_macro_1.cpp b/hash/test/hash_no_ext_macro_1.cpp
index 5924f4e..c0f84ae 100644
--- a/hash/test/hash_no_ext_macro_1.cpp
+++ b/hash/test/hash_no_ext_macro_1.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. 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)
+// Copyright 2006-2007 Daniel James.
+// Distributed under 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)
 
 #define HASH_NAMESPACE boost
 #include <boost/functional/hash.hpp>
diff --git a/hash/test/hash_no_ext_macro_2.cpp b/hash/test/hash_no_ext_macro_2.cpp
index 53c6e8b..75b05d7 100644
--- a/hash/test/hash_no_ext_macro_2.cpp
+++ b/hash/test/hash_no_ext_macro_2.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. 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)
+// Copyright 2006-2007 Daniel James.
+// Distributed under 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)
 
 #define HASH_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index 218442b..89910a2 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
@@ -21,6 +21,13 @@
 
 #include "./compile_time.hpp"
 
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#pragma warning(disable:4127) // conditional expression is constant
+#pragma warning(disable:4309) // truncation of constant value
+#pragma warning(disable:4310) // cast truncates constant value
+#endif
+
 template <class T>
 void numeric_test(T*)
 {
@@ -31,7 +38,7 @@ void numeric_test(T*)
     HASH_NAMESPACE::hash<T> x1;
     HASH_NAMESPACE::hash<T> x2;
 
-    T v1 = -5;
+    T v1 = (T) -5;
     BOOST_TEST(x1(v1) == x2(v1));
     BOOST_TEST(x1(T(-5)) == x2(T(-5)));
     BOOST_TEST(x1(T(0)) == x2(T(0)));
@@ -48,7 +55,8 @@ void numeric_test(T*)
 
     if (limits::is_integer)
     {
-        BOOST_TEST(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
+        if(limits::is_signed || limits::digits <= std::numeric_limits<std::size_t>::digits)
+            BOOST_TEST(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
         BOOST_TEST(HASH_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
         BOOST_TEST(HASH_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
         BOOST_TEST(HASH_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
@@ -105,16 +113,29 @@ void poor_quality_tests(T*)
         BOOST_TEST(x1((limits::max)()) != x2((limits::max)() - 1));
 }
 
+void bool_test()
+{
+    HASH_NAMESPACE::hash<bool> x1;
+    HASH_NAMESPACE::hash<bool> x2;
+    
+    BOOST_TEST(x1(true) == x2(true));
+    BOOST_TEST(x1(false) == x2(false));
+    BOOST_TEST(x1(true) != x2(false));
+    BOOST_TEST(x1(false) != x2(true));
+}
 
 #define NUMERIC_TEST(type, name) \
     std::cerr<<"Testing: " BOOST_STRINGIZE(name) "\n"; \
     numeric_test((type*) 0); \
     limits_test((type*) 0); \
     poor_quality_tests((type*) 0);
+#define NUMERIC_TEST_NO_LIMITS(type, name) \
+    std::cerr<<"Testing: " BOOST_STRINGIZE(name) "\n"; \
+    numeric_test((type*) 0); \
+    poor_quality_tests((type*) 0);
 
 int main()
 {
-    NUMERIC_TEST(bool, bool)
     NUMERIC_TEST(char, char)
     NUMERIC_TEST(signed char, schar)
     NUMERIC_TEST(unsigned char, uchar)
@@ -128,11 +149,19 @@ int main()
     NUMERIC_TEST(long, hash_long)
     NUMERIC_TEST(unsigned long, ulong)
 
+#if defined(BOOST_HAS_LONG_LONG)
+    NUMERIC_TEST_NO_LIMITS(long long, hash_longlong)
+    NUMERIC_TEST_NO_LIMITS(unsigned long long, ulonglong)
+#endif
+
     NUMERIC_TEST(float, float)
     NUMERIC_TEST(double, double)
-    NUMERIC_TEST(long double, ldouble)
+
+    bool_test();
 
     return boost::report_errors();
 }
 
-
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
diff --git a/hash/test/hash_pointer_test.cpp b/hash/test/hash_pointer_test.cpp
index e38c31d..78d3416 100644
--- a/hash/test/hash_pointer_test.cpp
+++ b/hash/test/hash_pointer_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index fc56ced..9e5ef09 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_sequence_test.hpp b/hash/test/hash_sequence_test.hpp
index 7668125..eb3295c 100644
--- a/hash/test/hash_sequence_test.hpp
+++ b/hash/test/hash_sequence_test.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #if !defined(CONTAINER_TYPE)
 #error "CONTAINER_TYPE not defined"
@@ -9,6 +9,11 @@
 
 #include <boost/preprocessor/cat.hpp>
 
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#pragma warning(disable:4245) // signed/unsigned mismatch
+#endif
+
 namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
 {
     template <class T>
@@ -63,5 +68,9 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
     }
 }
 
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
 #undef CONTAINER_TYPE
 #endif
diff --git a/hash/test/hash_set_test.cpp b/hash/test/hash_set_test.cpp
index e29334c..442291c 100644
--- a/hash/test/hash_set_test.cpp
+++ b/hash/test/hash_set_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_set_test.hpp b/hash/test/hash_set_test.hpp
index 26ea1af..50791a6 100644
--- a/hash/test/hash_set_test.hpp
+++ b/hash/test/hash_set_test.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #if !defined(CONTAINER_TYPE)
 #error "CONTAINER_TYPE not defined"
@@ -9,12 +9,17 @@
 
 #include <boost/preprocessor/cat.hpp>
 
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#pragma warning(disable:4245) // signed/unsigned mismatch
+#endif
+
 namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
 {
     template <class T>
     void integer_tests(T* = 0)
     {
-        const int number_of_containers = 11;
+        const int number_of_containers = 12;
         T containers[number_of_containers];
 
         for(int i = 0; i < 5; ++i) {
@@ -30,6 +35,11 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         containers[9].insert(-1);
         containers[10].insert(-1);
         containers[10].insert(1);
+        containers[11].insert(1);
+        containers[11].insert(2);
+        containers[11].insert(3);
+        containers[11].insert(4);
+        containers[11].insert(5);
 
         HASH_NAMESPACE::hash<T> hasher;
 
@@ -61,5 +71,9 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
     }
 }
 
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
 #undef CONTAINER_TYPE
 #endif
diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp
index 85adacc..42ca0b7 100644
--- a/hash/test/hash_string_test.cpp
+++ b/hash/test/hash_string_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_value_array_test.cpp b/hash/test/hash_value_array_test.cpp
index 02444d8..7080665 100644
--- a/hash/test/hash_value_array_test.cpp
+++ b/hash/test/hash_value_array_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 // On some compilers hash_value isn't available for arrays, so I test it
 // separately from the main array tests.
diff --git a/hash/test/hash_vector_test.cpp b/hash/test/hash_vector_test.cpp
index 60bac31..bcc9c51 100644
--- a/hash/test/hash_vector_test.cpp
+++ b/hash/test/hash_vector_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include "./config.hpp"
 
diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp
index eeb1160..19a7299 100644
--- a/hash/test/link_ext_test.cpp
+++ b/hash/test/link_ext_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. 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)
+// Copyright 2006-2007 Daniel James.
+// Distributed under 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)
 
 #define HASH_NAMESPACE boost
 #include <boost/functional/hash.hpp>
diff --git a/hash/test/link_no_ext_test.cpp b/hash/test/link_no_ext_test.cpp
index ab2701c..a3db5b1 100644
--- a/hash/test/link_no_ext_test.cpp
+++ b/hash/test/link_no_ext_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #define HASH_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS
diff --git a/hash/test/link_test.cpp b/hash/test/link_test.cpp
index fae30cd..eb8e51f 100644
--- a/hash/test/link_test.cpp
+++ b/hash/test/link_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include <boost/functional/hash.hpp>
 
diff --git a/hash/test/link_test_2.cpp b/hash/test/link_test_2.cpp
index 57d6528..d40f1db 100644
--- a/hash/test/link_test_2.cpp
+++ b/hash/test/link_test_2.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. 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)
+// Copyright 2005-2007 Daniel James.
+// Distributed under 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)
 
 #include <boost/functional/hash.hpp>
 

From 6d7843e73e1b01482a0e2930f25bf935a8f0b2c5 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 9 Dec 2007 15:46:20 +0000
Subject: [PATCH 033/111] Merge fix to suppress a Visual C++ warning. Fixes
 #1509

[SVN r41920]
---
 include/boost/functional/detail/hash_float.hpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/boost/functional/detail/hash_float.hpp b/include/boost/functional/detail/hash_float.hpp
index d005e7d..298d0c0 100644
--- a/include/boost/functional/detail/hash_float.hpp
+++ b/include/boost/functional/detail/hash_float.hpp
@@ -14,6 +14,14 @@
 # pragma once
 #endif
 
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#if BOOST_MSVC >= 1400
+#pragma warning(disable:6294) // Ill-defined for-loop: initial condition does
+                              // not satisfy test. Loop body not executed 
+#endif
+#endif
+
 #include <boost/functional/detail/float_functions.hpp>
 #include <boost/integer/static_log2.hpp>
 #include <boost/cstdint.hpp>
@@ -181,4 +189,8 @@ namespace boost
     }
 }
 
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
 #endif

From e1719106029cb16dc7f1947103f731a5ca7be7f7 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 10 Feb 2008 16:39:38 +0000
Subject: [PATCH 034/111] Merged revisions 43206,43208-43213 via svnmerge from
 https://svn.boost.org/svn/boost/trunk

........
  r43206 | danieljames | 2008-02-10 09:55:03 +0000 (Sun, 10 Feb 2008) | 1 line

  Fix some broken links.
........
  r43209 | danieljames | 2008-02-10 14:56:22 +0000 (Sun, 10 Feb 2008) | 1 line

  Link to people pages on the website, as they've been removed from the download.
........
  r43210 | danieljames | 2008-02-10 15:02:17 +0000 (Sun, 10 Feb 2008) | 1 line

  Point links to the pages that used to be in 'more' to the site.
........
  r43212 | danieljames | 2008-02-10 16:10:16 +0000 (Sun, 10 Feb 2008) | 1 line

  Fix links on the home page as well.
........
  r43213 | danieljames | 2008-02-10 16:21:22 +0000 (Sun, 10 Feb 2008) | 1 line

  Generated documentation which is no longer generated.
........


[SVN r43214]
---
 binders.html         |  4 ++--
 function_traits.html |  4 ++--
 index.html           | 12 ++++++------
 mem_fun.html         |  4 ++--
 negators.html        |  4 ++--
 ptr_fun.html         |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/binders.html b/binders.html
index 4220ed2..f30ed90 100644
--- a/binders.html
+++ b/binders.html
@@ -20,10 +20,10 @@
       <td><a href="../libraries.htm"><font face="Arial" color=
       "#FFFFFF"><big>Libraries</big></font></a></td>
 
-      <td><a href="../../people/people.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/people/people.htm"><font face="Arial" color=
       "#FFFFFF"><big>People</big></font></a></td>
 
-      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/more/faq.htm"><font face="Arial" color=
       "#FFFFFF"><big>FAQ</big></font></a></td>
 
       <td><a href="../../more/index.htm"><font face="Arial" color=
diff --git a/function_traits.html b/function_traits.html
index c2a841b..65fbd9f 100644
--- a/function_traits.html
+++ b/function_traits.html
@@ -20,10 +20,10 @@
       <td><a href="../libraries.htm"><font face="Arial" color=
       "#FFFFFF"><big>Libraries</big></font></a></td>
 
-      <td><a href="../../people/people.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/people/people.htm"><font face="Arial" color=
       "#FFFFFF"><big>People</big></font></a></td>
 
-      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/more/faq.htm"><font face="Arial" color=
       "#FFFFFF"><big>FAQ</big></font></a></td>
 
       <td><a href="../../more/index.htm"><font face="Arial" color=
diff --git a/index.html b/index.html
index 2dd91a0..aea70a6 100644
--- a/index.html
+++ b/index.html
@@ -22,10 +22,10 @@
       <td><a href="../libraries.htm"><font face="Arial" color=
       "#FFFFFF"><big>Libraries</big></font></a></td>
 
-      <td><a href="../../people/people.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/people/people.htm"><font face="Arial" color=
       "#FFFFFF"><big>People</big></font></a></td>
 
-      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/more/faq.htm"><font face="Arial" color=
       "#FFFFFF"><big>FAQ</big></font></a></td>
 
       <td><a href="../../more/index.htm"><font face="Arial" color=
@@ -234,15 +234,15 @@ std::for_each(c.begin(), c.end(),
 
   <h3>Author</h3>
 
-  <p><a href="../../people/mark_rodgers.htm">Mark Rodgers</a></p>
+  <p><a href="http://www.boost.org/people/mark_rodgers.htm">Mark Rodgers</a></p>
 
   <h3>Acknowledgements</h3>
 
-  <p>Thanks to <a href="../../people/john_maddock.htm">John Maddock</a> for
+  <p>Thanks to <a href="http://www.boost.org/people/john_maddock.htm">John Maddock</a> for
   suggesting the mechanism that allowed the function objects traits to work
-  correctly. <a href="../../people/jens_maurer.htm">Jens Maurer</a> provided
+  correctly. <a href="http://www.boost.org/people/jens_maurer.htm">Jens Maurer</a> provided
   invaluable feedback during the <a href=
-  "../../more/formal_review_process.htm">formal review process</a>.</p>
+  "http://www.boost.org/more/formal_review_process.htm">formal review process</a>.</p>
   <hr>
 
   <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
diff --git a/mem_fun.html b/mem_fun.html
index 3fcff5f..901ec2a 100644
--- a/mem_fun.html
+++ b/mem_fun.html
@@ -20,10 +20,10 @@
       <td><a href="../libraries.htm"><font face="Arial" color=
       "#FFFFFF"><big>Libraries</big></font></a></td>
 
-      <td><a href="../../people/people.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/people/people.htm"><font face="Arial" color=
       "#FFFFFF"><big>People</big></font></a></td>
 
-      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/more/faq.htm"><font face="Arial" color=
       "#FFFFFF"><big>FAQ</big></font></a></td>
 
       <td><a href="../../more/index.htm"><font face="Arial" color=
diff --git a/negators.html b/negators.html
index c17c64e..226b0d0 100644
--- a/negators.html
+++ b/negators.html
@@ -20,10 +20,10 @@
       <td><a href="../libraries.htm"><font face="Arial" color=
       "#FFFFFF"><big>Libraries</big></font></a></td>
 
-      <td><a href="../../people/people.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/people/people.htm"><font face="Arial" color=
       "#FFFFFF"><big>People</big></font></a></td>
 
-      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/more/faq.htm"><font face="Arial" color=
       "#FFFFFF"><big>FAQ</big></font></a></td>
 
       <td><a href="../../more/index.htm"><font face="Arial" color=
diff --git a/ptr_fun.html b/ptr_fun.html
index d5b2eb0..10c0ac3 100644
--- a/ptr_fun.html
+++ b/ptr_fun.html
@@ -20,10 +20,10 @@
       <td><a href="../libraries.htm"><font face="Arial" color=
       "#FFFFFF"><big>Libraries</big></font></a></td>
 
-      <td><a href="../../people/people.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/people/people.htm"><font face="Arial" color=
       "#FFFFFF"><big>People</big></font></a></td>
 
-      <td><a href="../../more/faq.htm"><font face="Arial" color=
+      <td><a href="http://www.boost.org/more/faq.htm"><font face="Arial" color=
       "#FFFFFF"><big>FAQ</big></font></a></td>
 
       <td><a href="../../more/index.htm"><font face="Arial" color=

From 1d2dc015a9d0ba9329764d1ae21746bd72a16429 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 12 Jun 2008 00:27:13 +0000
Subject: [PATCH 035/111] Merge all hash changes from trunk.

[SVN r46343]
---
 hash/doc/Jamfile.v2                           |  27 ++-
 hash/doc/changes.qbk                          |  46 ++++-
 hash/doc/disable.qbk                          |   2 +-
 hash/doc/hash.qbk                             |   2 +-
 hash/doc/intro.qbk                            |  10 +-
 hash/doc/links.qbk                            |   2 +-
 hash/doc/portability.qbk                      |   2 +-
 hash/doc/ref.xml                              |   9 +-
 hash/doc/thanks.qbk                           |   2 +-
 hash/doc/tutorial.qbk                         |   2 +-
 hash/examples/books.cpp                       |   2 +-
 hash/examples/books.hpp                       |   2 +-
 hash/examples/portable.cpp                    |   2 +-
 hash/test/Jamfile.v2                          |   2 +-
 hash/test/compile_time.hpp                    |   2 +-
 hash/test/config.hpp                          |   2 +-
 hash/test/container_fwd_test.cpp              |   4 +-
 hash/test/hash_built_in_array_test.cpp        |  18 +-
 hash/test/hash_complex_test.cpp               |  12 +-
 hash/test/hash_custom_test.cpp                |  18 +-
 hash/test/hash_deprecated_headers.cpp         |   4 +-
 hash/test/hash_deque_test.cpp                 |   8 +-
 hash/test/hash_float_test.cpp                 |   6 +-
 hash/test/hash_float_test.hpp                 | 146 +++++++-------
 hash/test/hash_friend_test.cpp                |  18 +-
 hash/test/hash_function_pointer_test.cpp      |  34 ++--
 hash/test/hash_fwd_test.hpp                   |   2 +-
 hash/test/hash_fwd_test_1.cpp                 |  20 +-
 hash/test/hash_fwd_test_2.cpp                 |   8 +-
 hash/test/hash_global_namespace_test.cpp      |  18 +-
 hash/test/hash_list_test.cpp                  |   8 +-
 hash/test/hash_long_double_test.cpp           |   6 +-
 hash/test/hash_map_test.cpp                   |   8 +-
 hash/test/hash_map_test.hpp                   |  10 +-
 hash/test/hash_no_ext_fail_test.cpp           |   4 +-
 hash/test/hash_no_ext_macro_1.cpp             |  10 +-
 hash/test/hash_no_ext_macro_2.cpp             |  10 +-
 hash/test/hash_number_test.cpp                |  76 ++++----
 hash/test/hash_pointer_test.cpp               |  20 +-
 hash/test/hash_range_test.cpp                 |  30 +--
 hash/test/hash_sequence_test.hpp              |  10 +-
 hash/test/hash_set_test.cpp                   |   8 +-
 hash/test/hash_set_test.hpp                   |  10 +-
 hash/test/hash_string_test.cpp                |  32 +--
 hash/test/hash_value_array_test.cpp           |  16 +-
 hash/test/hash_vector_test.cpp                |   8 +-
 hash/test/link_ext_test.cpp                   |   6 +-
 hash/test/link_no_ext_test.cpp                |  11 +-
 hash/test/link_test.cpp                       |   4 +-
 hash/test/link_test_2.cpp                     |   2 +-
 .../boost/functional/detail/container_fwd.hpp |   2 +-
 .../functional/detail/float_functions.hpp     |   2 +-
 .../boost/functional/detail/hash_float.hpp    |  81 ++++----
 include/boost/functional/hash.hpp             |   3 +-
 include/boost/functional/hash/deque.hpp       |   2 +-
 include/boost/functional/hash/extensions.hpp  | 182 +++++++++++++++++
 include/boost/functional/hash/hash.hpp        | 184 +-----------------
 include/boost/functional/hash/list.hpp        |   2 +-
 include/boost/functional/hash/map.hpp         |   2 +-
 include/boost/functional/hash/pair.hpp        |   2 +-
 include/boost/functional/hash/set.hpp         |   2 +-
 include/boost/functional/hash/vector.hpp      |   2 +-
 include/boost/functional/hash_fwd.hpp         |   2 +-
 63 files changed, 637 insertions(+), 552 deletions(-)
 create mode 100644 include/boost/functional/hash/extensions.hpp

diff --git a/hash/doc/Jamfile.v2 b/hash/doc/Jamfile.v2
index 9b7bdb7..731a228 100644
--- a/hash/doc/Jamfile.v2
+++ b/hash/doc/Jamfile.v2
@@ -1,9 +1,28 @@
 
-# Copyright 2005 Daniel James.
+# Copyright 2005-2008 Daniel James.
 # Distributed under 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)
 
-using quickbook ;
-
 xml hash : hash.qbk ;
-boostbook standalone : hash ;
+boostbook standalone : hash :
+    <xsl:param>admon.graphics.path=images/
+    <xsl:param>navig.graphics.path=images/
+    <xsl:param>html.stylesheet=boostbook.css
+    <xsl:param>boost.root=../../../../..
+    <xsl:param>boost.libraries=../../../../libraries.htm
+    <xsl:param>chunk.first.sections=1
+    <xsl:param>chunk.section.depth=2
+    <xsl:param>generate.section.toc.level=2
+    <xsl:param>toc.section.depth=1
+    <xsl:param>toc.max.depth=1
+
+    <dependency>css
+    <dependency>images
+    ;
+
+install css : [ glob $(BOOST_ROOT)/doc/src/*.css ]
+    : <location>html ;
+install images : [ glob $(BOOST_ROOT)/doc/src/images/*.png ]
+    : <location>html/images ;
+explicit css ;
+explicit images ;
diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 4a15288..0288804 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2007 Daniel James.
+[/ Copyright 2005-2008 Daniel James.
  / Distributed under 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) ]
 
@@ -9,24 +9,54 @@
 
 * Initial Release
 
-[h2 Changes in Boost 1.33.1]
+[h2 Boost 1.33.1]
 
 * Fixed the points example, as pointed out by 沈慧峰.
 
-[h2 Changes in Boost 1.34.0]
+[h2 Boost 1.34.0]
 
 * Use declarations for standard classes, so that the library
   doesn't need to include all of their headers
 * Deprecated the `<boost/functional/hash/*.hpp>` headers. Now a single header,
   <[headerref boost/functional/hash.hpp]> is used.
 * Add support for the `BOOST_HASH_NO_EXTENSIONS` macro, which
-  disables the extensions to TR1
+  disables the extensions to TR1.
+
 * Minor improvements to the hash functions for floating point numbers.
+* Update the portable example to hopefully be more generally portable.
 
-[h2 Future Developments]
+[h2 Boost 1.34.1]
 
-* A more portable hash function, as described by Daniel Krügler in
- [@http://lists.boost.org/boost-users/2005/08/13418.php a post to the boost users list].
-* Implement `hash_value` for more classes, including `std::complex`.
+* [@http://svn.boost.org/trac/boost/ticket/952 Ticket 952]:
+  Suppress incorrect 64-bit warning on Visual C++.
+
+[h2 Boost 1.35.0]
+
+* Support for `long long`, `std::complex`.
+* Improved algorithm for hashing floating point numbers:
+  * Improved portablity, as described by Daniel Krügler in
+    [@http://lists.boost.org/boost-users/2005/08/13418.php
+    a post to the boost users list].
+  * Fits more information into each combine loop, which can reduce the
+    the number of times combine is called and hopefully give a better
+    quality hash function.
+  * Improved the algorithm for hashing floating point numbers.
+  * On Cygwin use a binary hash function for floating point numbers, as 
+    Cygwin doesn't have decent floating point functions for `long double`.
+  * Never uses `fpclass` which doesn't support `long double`.
+  * [@http://svn.boost.org/trac/boost/ticket/1064 Ticket 1064]:
+    Removed unnecessary use of `errno`.
+* Explicitly overload for more built in types.
+* Minor improvements to the documentation.
+* A few bug and warning fixes:
+  * [@http://svn.boost.org/trac/boost/ticket/1509 Ticket 1509]:
+    Suppress another Visual C++ warning.
+  * Some workarounds for the Sun compilers.
+
+[h2 Boost 1.36.0]
+
+* Stop using OpenBSD's dodgy `std::numeric_limits`.
+* Using the boost typedefs for `long long` and `unsigned long long`.
+* Move the extensions into their own header.
 
 [endsect]
diff --git a/hash/doc/disable.qbk b/hash/doc/disable.qbk
index 3d69431..27dec6b 100644
--- a/hash/doc/disable.qbk
+++ b/hash/doc/disable.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2007 Daniel James.
+[/ Copyright 2005-2008 Daniel James.
  / Distributed under 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) ]
 
diff --git a/hash/doc/hash.qbk b/hash/doc/hash.qbk
index 5bb200a..39d6d97 100644
--- a/hash/doc/hash.qbk
+++ b/hash/doc/hash.qbk
@@ -1,7 +1,7 @@
 [library Boost.Functional/Hash
     [quickbook 1.4]
     [authors [James, Daniel]]
-    [copyright 2005 2006 2007 Daniel James]
+    [copyright 2005 2006 2007 2008 Daniel James]
     [purpose A TR1 hash function object that can be extended to hash user
         defined types]
     [category higher-order]
diff --git a/hash/doc/intro.qbk b/hash/doc/intro.qbk
index b6dac9e..bba5de3 100644
--- a/hash/doc/intro.qbk
+++ b/hash/doc/intro.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2007 Daniel James.
+[/ Copyright 2005-2008 Daniel James.
  / Distributed under 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) ]
 
@@ -11,10 +11,13 @@
 [def __tr1__
     [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf
     TR1]]
+[def __unordered__ [link unordered Boost.Unordered]]
+[def __intrusive__ [link intrusive.unordered_set_unordered_multiset Boost.Intrusive]]
 [def __multi-index__ [@../../libs/multi_index/doc/index.html
     Boost Multi-Index Containers Library]]
 [def __multi-index-short__ [@../../libs/multi_index/doc/index.html
     Boost.MultiIndex]]
+[def __bimap__ [@../../libs/bimap/index.html Boost.Bimap]]
 [def __issues__
     [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1837.pdf
     Library Extension Technical Report Issues List]]
@@ -22,8 +25,9 @@
 [def __hash-table__ [@http://en.wikipedia.org/wiki/Hash_table hash table]]
 
 [classref boost::hash] is an implementation of the __hash-function__ object
-specified by the __tr1-full__ (TR1). It is intended for use as the default hash function
-for unordered associative containers, and the __multi-index__'s hash indexes.
+specified by the __tr1-full__ (TR1). It is the default hash function for
+__unordered__, __intrusive__'s unordered associative containers, and
+__multi-index-short__'s hash indicies and __bimap__'s `unordered_set_of`.
 
 As it is compliant with __tr1__, it will work with:
 
diff --git a/hash/doc/links.qbk b/hash/doc/links.qbk
index 5d9a269..405536e 100644
--- a/hash/doc/links.qbk
+++ b/hash/doc/links.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2007 Daniel James.
+[/ Copyright 2005-2008 Daniel James.
  / Distributed under 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) ]
 
diff --git a/hash/doc/portability.qbk b/hash/doc/portability.qbk
index 0e89196..e9100ce 100644
--- a/hash/doc/portability.qbk
+++ b/hash/doc/portability.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2007 Daniel James.
+[/ Copyright 2005-2008 Daniel James.
  / Distributed under 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) ]
 
diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index 21acd4a..6bb32ce 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -1,6 +1,6 @@
 
 <!--
-Copyright Daniel James 2005-2007
+Copyright Daniel James 2005-2008
 Distributed under 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)
 -->
@@ -406,6 +406,8 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
         </method>
       </struct-specialization>
 
+      <free-function-group name="Support functions (Boost extension)."> 
+
       <!--
         boost::hash_combine
         -->
@@ -500,6 +502,10 @@ for(; first != last; ++first)
         </para></throws>
       </overloaded-function>
 
+      </free-function-group>
+
+      <free-function-group name="Overloadable hash implementation (Boost extension).">
+
       <!--
         boost::hash_value - integers
         -->
@@ -797,6 +803,7 @@ return seed;</programlisting></entry>
           </informaltable>
         </returns>
       </overloaded-function>
+      </free-function-group>
     </namespace>
   </header>
 </library-reference>
diff --git a/hash/doc/thanks.qbk b/hash/doc/thanks.qbk
index 27bffc1..fcc5108 100644
--- a/hash/doc/thanks.qbk
+++ b/hash/doc/thanks.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2007 Daniel James.
+[/ Copyright 2005-2008 Daniel James.
  / Distributed under 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) ]
 
diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index e30a181..eaf9a95 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2007 Daniel James.
+[/ Copyright 2005-2008 Daniel James.
  / Distributed under 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) ]
 
diff --git a/hash/examples/books.cpp b/hash/examples/books.cpp
index 466ff44..2615564 100644
--- a/hash/examples/books.cpp
+++ b/hash/examples/books.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/examples/books.hpp b/hash/examples/books.hpp
index 4acdd86..c0cf414 100644
--- a/hash/examples/books.hpp
+++ b/hash/examples/books.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/examples/portable.cpp b/hash/examples/portable.cpp
index 962dca2..98026c1 100644
--- a/hash/examples/portable.cpp
+++ b/hash/examples/portable.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index b0ac974..da8a0f9 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -1,5 +1,5 @@
 
-# Copyright 2005-2007 Daniel James.
+# Copyright 2005-2008 Daniel James.
 # Distributed under 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)
 
diff --git a/hash/test/compile_time.hpp b/hash/test/compile_time.hpp
index 99589d1..873df13 100644
--- a/hash/test/compile_time.hpp
+++ b/hash/test/compile_time.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/config.hpp b/hash/test/config.hpp
index 12d9aca..9ef55b7 100644
--- a/hash/test/config.hpp
+++ b/hash/test/config.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/container_fwd_test.cpp b/hash/test/container_fwd_test.cpp
index 232c357..5c3c5e1 100644
--- a/hash/test/container_fwd_test.cpp
+++ b/hash/test/container_fwd_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -77,7 +77,7 @@ static void test(std::pair<X, Y> const&)
 #include <complex>
 #include <utility>
 
-int main()
+int main(int, char**)
 {
     std::deque<int> x1;
     std::list<std::string> x2;
diff --git a/hash/test/hash_built_in_array_test.cpp b/hash/test/hash_built_in_array_test.cpp
index 5904615..127d388 100644
--- a/hash/test/hash_built_in_array_test.cpp
+++ b/hash/test/hash_built_in_array_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -37,11 +37,11 @@ void array_int_test()
     int array3[2] = {2, 3};
     HASH_NAMESPACE::hash<int[2]> hasher3;
 
-    BOOST_TEST(hasher1(array1)
+    BOOST_CHECK(hasher1(array1)
             == HASH_NAMESPACE::hash_range(array1, array1 + length1));
-    BOOST_TEST(hasher2(array2)
+    BOOST_CHECK(hasher2(array2)
             == HASH_NAMESPACE::hash_range(array2, array2 + length2));
-    BOOST_TEST(hasher3(array3)
+    BOOST_CHECK(hasher3(array3)
             == HASH_NAMESPACE::hash_range(array3, array3 + length3));
 }
 
@@ -59,17 +59,17 @@ void two_dimensional_array_test()
         HASH_NAMESPACE::hash_combine(seed1, seed2);
     }
 
-    BOOST_TEST(hasher(array) == seed1);
-    BOOST_TEST(hasher(array) == HASH_NAMESPACE::hash_range(array, array + 3));
+    BOOST_CHECK(hasher(array) == seed1);
+    BOOST_CHECK(hasher(array) == HASH_NAMESPACE::hash_range(array, array + 3));
 }
 
 #endif // TEST_EXTENSIONS
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     array_int_test();
     two_dimensional_array_test();
 #endif
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
index a0707b5..890dc0a 100644
--- a/hash/test/hash_complex_test.cpp
+++ b/hash/test/hash_complex_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -41,13 +41,13 @@ void generic_complex_tests(std::complex<T> v)
 {
     HASH_NAMESPACE::hash<std::complex<T> > complex_hasher;
 
-    BOOST_TEST(complex_hasher(v) == complex_hasher(v));
+    BOOST_CHECK(complex_hasher(v) == complex_hasher(v));
 
     HASH_NAMESPACE::hash<T> real_hasher;
     T real = v.real();
     T imag = v.imag();
 
-    BOOST_TEST(real_hasher(real) == complex_hasher(std::complex<T>(real)));
+    BOOST_CHECK(real_hasher(real) == complex_hasher(std::complex<T>(real)));
 
     if(imag != 0 && real_hasher(real) == complex_hasher(v)) {
         std::ostringstream os;
@@ -90,7 +90,7 @@ void complex_integral_tests(Integer*)
     }
 }
 
-int main()
+int test_main(int, char**)
 {
     complex_float_tests((float*) 0);
     complex_float_tests((double*) 0);
@@ -102,7 +102,7 @@ int main()
     complex_integral_tests((unsigned int*) 0);
     complex_integral_tests((unsigned long*) 0);
 
-    return boost::report_errors();
+    return 0;
 }
 
 #endif
diff --git a/hash/test/hash_custom_test.cpp b/hash/test/hash_custom_test.cpp
index 8df3e83..ccd59df 100644
--- a/hash/test/hash_custom_test.cpp
+++ b/hash/test/hash_custom_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -48,7 +48,7 @@ namespace boost
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -59,13 +59,13 @@ namespace boost
 void custom_tests()
 {
     HASH_NAMESPACE::hash<test::custom> custom_hasher;
-    BOOST_TEST(custom_hasher(10) == 100u);
+    BOOST_CHECK(custom_hasher(10) == 100u);
     test::custom x(55);
-    BOOST_TEST(custom_hasher(x) == 550u);
+    BOOST_CHECK(custom_hasher(x) == 550u);
 
     {
         using namespace HASH_NAMESPACE;
-        BOOST_TEST(custom_hasher(x) == hash_value(x));
+        BOOST_CHECK(custom_hasher(x) == hash_value(x));
     }
 
     std::vector<test::custom> custom_vector;
@@ -83,17 +83,17 @@ void custom_tests()
     HASH_NAMESPACE::hash_combine(seed2, 250u);
     HASH_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_TEST(seed ==
+    BOOST_CHECK(seed ==
             HASH_NAMESPACE::hash_range(custom_vector.begin(), custom_vector.end()));
-    BOOST_TEST(seed == seed2);
+    BOOST_CHECK(seed == seed2);
 }
 
 #endif // TEST_EXTENSIONS
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     custom_tests();
 #endif
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_deprecated_headers.cpp b/hash/test/hash_deprecated_headers.cpp
index 3257d9b..5ebab8f 100644
--- a/hash/test/hash_deprecated_headers.cpp
+++ b/hash/test/hash_deprecated_headers.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2007 Daniel James.
+// Copyright 2007-2008 Daniel James.
 // Distributed under 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)
 
@@ -19,7 +19,7 @@
 
 #include <vector>
 
-int main() {
+int main(int, char**) {
     std::vector<int> v;
     boost::hash<std::vector<int> > x;
     x(v);
diff --git a/hash/test/hash_deque_test.cpp b/hash/test/hash_deque_test.cpp
index 7238319..5348a03 100644
--- a/hash/test/hash_deque_test.cpp
+++ b/hash/test/hash_deque_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -25,11 +25,11 @@ using std::deque;
 
 #endif // TEST_EXTENSIONS
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     deque_tests::deque_hash_integer_tests();
 #endif
 
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_float_test.cpp b/hash/test/hash_float_test.cpp
index 6ceda4b..7c5d59c 100644
--- a/hash/test/hash_float_test.cpp
+++ b/hash/test/hash_float_test.cpp
@@ -1,11 +1,11 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
 #include "hash_float_test.hpp"
 
-int main()
+int test_main(int, char**)
 {
     std::cerr<<"Compiler: "<<BOOST_COMPILER<<"\n";
     std::cerr<<"Platform: "<<BOOST_PLATFORM<<"\n";
@@ -14,5 +14,5 @@ int main()
     float_tests("float", (float*) 0);
     float_tests("double", (double*) 0);
 
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
index 2fda7b8..eece27b 100644
--- a/hash/test/hash_float_test.hpp
+++ b/hash/test/hash_float_test.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #include <cmath>
 #include <boost/limits.hpp>
@@ -29,12 +29,12 @@ void float_tests(char const* name, T* = 0)
     std::cerr<<"\n"
         <<"Testing " BOOST_STRINGIZE(HASH_NAMESPACE) "::hash<"<<name<<">\n"
         <<"\n"
-        <<"std::numeric_limits<T>::digits = "
-            <<std::numeric_limits<T>::digits<<"\n"
-        <<"std::numeric_limits<int>::digits = "
-            <<std::numeric_limits<int>::digits<<"\n"
-        <<"std::numeric_limits<std::size_t>::digits = "
-            <<std::numeric_limits<std::size_t>::digits<<"\n"
+        <<"boost::hash_detail::limits<T>::digits = "
+            <<boost::hash_detail::limits<T>::digits<<"\n"
+        <<"boost::hash_detail::limits<int>::digits = "
+            <<boost::hash_detail::limits<int>::digits<<"\n"
+        <<"boost::hash_detail::limits<std::size_t>::digits = "
+            <<boost::hash_detail::limits<std::size_t>::digits<<"\n"
         <<"\n"
         ;
 
@@ -43,11 +43,11 @@ void float_tests(char const* name, T* = 0)
     T zero = 0;
     T minus_zero = (T) -1 * zero;
 
-    BOOST_TEST(zero == minus_zero);
-    BOOST_TEST(x1(zero) == x1(minus_zero));
+    BOOST_CHECK(zero == minus_zero);
+    BOOST_CHECK(x1(zero) == x1(minus_zero));
 
-    BOOST_TEST(x1(zero) == HASH_NAMESPACE::hash_value(zero));
-    BOOST_TEST(x1(minus_zero) == HASH_NAMESPACE::hash_value(minus_zero));
+    BOOST_CHECK(x1(zero) == HASH_NAMESPACE::hash_value(zero));
+    BOOST_CHECK(x1(minus_zero) == HASH_NAMESPACE::hash_value(minus_zero));
 
     using namespace std;
 
@@ -55,33 +55,33 @@ void float_tests(char const* name, T* = 0)
 #if defined(__BORLANDC__)
     std::cerr<<"Not running infinity checks on Borland, as it causes it to crash.\n";
 #else
-    if(std::numeric_limits<T>::has_infinity) {
+    if(boost::hash_detail::limits<T>::has_infinity) {
         T infinity = -log(zero);
         T infinity2 = (T) 1. / zero;
         T infinity3 = (T) -1. / minus_zero;
-        T infinity4 = std::numeric_limits<T>::infinity();
+        T infinity4 = boost::hash_detail::limits<T>::infinity();
 
         T minus_infinity = log(zero);
         T minus_infinity2 = (T) -1. / zero;
         T minus_infinity3 = (T) 1. / minus_zero;
 
-        BOOST_TEST(x1(infinity) == HASH_NAMESPACE::hash_value(infinity));
-        BOOST_TEST(x1(minus_infinity)
+        BOOST_CHECK(x1(infinity) == HASH_NAMESPACE::hash_value(infinity));
+        BOOST_CHECK(x1(minus_infinity)
                 == HASH_NAMESPACE::hash_value(minus_infinity));
 
         if(infinity == infinity2)
-            BOOST_TEST(x1(infinity) == x1(infinity2));
+            BOOST_CHECK(x1(infinity) == x1(infinity2));
         if(infinity == infinity3)
-            BOOST_TEST(x1(infinity) == x1(infinity3));
+            BOOST_CHECK(x1(infinity) == x1(infinity3));
         if(infinity == infinity4)
-            BOOST_TEST(x1(infinity) == x1(infinity4));
+            BOOST_CHECK(x1(infinity) == x1(infinity4));
 
         if(minus_infinity == minus_infinity2)
-            BOOST_TEST(x1(minus_infinity) == x1(minus_infinity2));
+            BOOST_CHECK(x1(minus_infinity) == x1(minus_infinity2));
         if(minus_infinity == minus_infinity3)
-            BOOST_TEST(x1(minus_infinity) == x1(minus_infinity3));
+            BOOST_CHECK(x1(minus_infinity) == x1(minus_infinity3));
 
-        BOOST_TEST(infinity != minus_infinity);
+        BOOST_CHECK(infinity != minus_infinity);
 
         if(x1(infinity) == x1(minus_infinity)) {
             std::cerr<<"x1(infinity) == x1(-infinity) == "<<x1(infinity)<<"\n";
@@ -89,46 +89,46 @@ void float_tests(char const* name, T* = 0)
 
         // This should really be 'has_denorm == denorm_present' but some
         // compilers don't have 'denorm_present'. See also a later use.
-        if(std::numeric_limits<T>::has_denorm) {
-            if(x1(std::numeric_limits<T>::denorm_min()) == x1(infinity)) {
+        if(boost::hash_detail::limits<T>::has_denorm) {
+            if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(infinity)) {
                 std::cerr<<"x1(denorm_min) == x1(infinity) == "<<x1(infinity)<<"\n";
             }
-            if(x1(std::numeric_limits<T>::denorm_min()) == x1(minus_infinity)) {
+            if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(minus_infinity)) {
                 std::cerr<<"x1(denorm_min) == x1(-infinity) == "<<x1(minus_infinity)<<"\n";
             }
         }
-        if(std::numeric_limits<T>::has_quiet_NaN) {
-            if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(infinity)) {
+        if(boost::hash_detail::limits<T>::has_quiet_NaN) {
+            if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(infinity)) {
                 std::cerr<<"x1(quiet_NaN) == x1(infinity) == "<<x1(infinity)<<"\n";
             }
-            if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(minus_infinity)) {
+            if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(minus_infinity)) {
                 std::cerr<<"x1(quiet_NaN) == x1(-infinity) == "<<x1(minus_infinity)<<"\n";
             }
         }
     }
 #endif
 
-    T max = (std::numeric_limits<T>::max)();
+    T max = (boost::hash_detail::limits<T>::max)();
     T half_max = max / 2;
     T quarter_max = max / 4;
     T three_quarter_max = max - quarter_max;
 
-    BOOST_TEST(x1(max) == HASH_NAMESPACE::hash_value(max));
-    BOOST_TEST(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
-    BOOST_TEST(x1(quarter_max) == HASH_NAMESPACE::hash_value(quarter_max));
-    BOOST_TEST(x1(three_quarter_max) == HASH_NAMESPACE::hash_value(three_quarter_max));
+    BOOST_CHECK(x1(max) == HASH_NAMESPACE::hash_value(max));
+    BOOST_CHECK(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
+    BOOST_CHECK(x1(quarter_max) == HASH_NAMESPACE::hash_value(quarter_max));
+    BOOST_CHECK(x1(three_quarter_max) == HASH_NAMESPACE::hash_value(three_quarter_max));
 
     // The '!=' tests could legitimately fail, but with my hash it indicates a bug.
-    BOOST_TEST(x1(max) == x1(max));
-    BOOST_TEST(x1(max) != x1(quarter_max));
-    BOOST_TEST(x1(max) != x1(half_max));
-    BOOST_TEST(x1(max) != x1(three_quarter_max));
-    BOOST_TEST(x1(quarter_max) == x1(quarter_max));
-    BOOST_TEST(x1(quarter_max) != x1(half_max));
-    BOOST_TEST(x1(quarter_max) != x1(three_quarter_max));
-    BOOST_TEST(x1(half_max) == x1(half_max));
-    BOOST_TEST(x1(half_max) != x1(three_quarter_max));
-    BOOST_TEST(x1(three_quarter_max) == x1(three_quarter_max));
+    BOOST_CHECK(x1(max) == x1(max));
+    BOOST_CHECK(x1(max) != x1(quarter_max));
+    BOOST_CHECK(x1(max) != x1(half_max));
+    BOOST_CHECK(x1(max) != x1(three_quarter_max));
+    BOOST_CHECK(x1(quarter_max) == x1(quarter_max));
+    BOOST_CHECK(x1(quarter_max) != x1(half_max));
+    BOOST_CHECK(x1(quarter_max) != x1(three_quarter_max));
+    BOOST_CHECK(x1(half_max) == x1(half_max));
+    BOOST_CHECK(x1(half_max) != x1(three_quarter_max));
+    BOOST_CHECK(x1(three_quarter_max) == x1(three_quarter_max));
 
 // Intel with gcc stdlib sometimes segfaults on calls to asin and acos.
 #if !((defined(__INTEL_COMPILER) || defined(__ICL) || \
@@ -137,55 +137,55 @@ void float_tests(char const* name, T* = 0)
     T v1 = asin((T) 1);
     T v2 = acos((T) 0);
     if(v1 == v2)
-        BOOST_TEST(x1(v1) == x1(v2));
-    BOOST_TEST(x1(v1) == HASH_NAMESPACE::hash_value(v1));
-    BOOST_TEST(x1(v2) == HASH_NAMESPACE::hash_value(v2));
+        BOOST_CHECK(x1(v1) == x1(v2));
+    BOOST_CHECK(x1(v1) == HASH_NAMESPACE::hash_value(v1));
+    BOOST_CHECK(x1(v2) == HASH_NAMESPACE::hash_value(v2));
 #endif
 
-    BOOST_TEST(x1(std::numeric_limits<T>::epsilon()) ==
-            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::epsilon()));
+    BOOST_CHECK(x1(boost::hash_detail::limits<T>::epsilon()) ==
+            HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::epsilon()));
 
-    BOOST_TEST(std::numeric_limits<T>::epsilon() != (T) 0);
-    if(x1(std::numeric_limits<T>::epsilon()) == x1((T) 0))
+    BOOST_CHECK(boost::hash_detail::limits<T>::epsilon() != (T) 0);
+    if(x1(boost::hash_detail::limits<T>::epsilon()) == x1((T) 0))
         std::cerr<<"x1(epsilon) == x1(0) == "<<x1((T) 0)<<"\n";
 
-    BOOST_TEST(-std::numeric_limits<T>::epsilon() != (T) 0);
-    if(x1(-std::numeric_limits<T>::epsilon()) == x1((T) 0))
+    BOOST_CHECK(-boost::hash_detail::limits<T>::epsilon() != (T) 0);
+    if(x1(-boost::hash_detail::limits<T>::epsilon()) == x1((T) 0))
         std::cerr<<"x1(-epsilon) == x1(0) == "<<x1((T) 0)<<"\n";
 
-    BOOST_TEST((T) 1 + std::numeric_limits<T>::epsilon() != (T) 1);
-    if(x1((T) 1 + std::numeric_limits<T>::epsilon()) == x1((T) 1))
+    BOOST_CHECK((T) 1 + boost::hash_detail::limits<T>::epsilon() != (T) 1);
+    if(x1((T) 1 + boost::hash_detail::limits<T>::epsilon()) == x1((T) 1))
         std::cerr<<"x1(1 + epsilon) == x1(1) == "<<x1((T) 1)<<"\n";
 
-    BOOST_TEST((T) 1 - std::numeric_limits<T>::epsilon() != (T) 1);
-    if(x1((T) 1 - std::numeric_limits<T>::epsilon()) == x1((T) 1))
+    BOOST_CHECK((T) 1 - boost::hash_detail::limits<T>::epsilon() != (T) 1);
+    if(x1((T) 1 - boost::hash_detail::limits<T>::epsilon()) == x1((T) 1))
         std::cerr<<"x1(1 - epsilon) == x1(1) == "<<x1((T) 1)<<"\n";
 
-    BOOST_TEST((T) -1 + std::numeric_limits<T>::epsilon() != (T) -1);
-    if(x1((T) -1 + std::numeric_limits<T>::epsilon()) == x1((T) -1))
+    BOOST_CHECK((T) -1 + boost::hash_detail::limits<T>::epsilon() != (T) -1);
+    if(x1((T) -1 + boost::hash_detail::limits<T>::epsilon()) == x1((T) -1))
         std::cerr<<"x1(-1 + epsilon) == x1(-1) == "<<x1((T) -1)<<"\n";
 
-    BOOST_TEST((T) -1 - std::numeric_limits<T>::epsilon() != (T) -1);
-    if(x1((T) -1 - std::numeric_limits<T>::epsilon()) == x1((T) -1))
+    BOOST_CHECK((T) -1 - boost::hash_detail::limits<T>::epsilon() != (T) -1);
+    if(x1((T) -1 - boost::hash_detail::limits<T>::epsilon()) == x1((T) -1))
         std::cerr<<"x1(-1 - epsilon) == x1(-1) == "<<x1((T) -1)<<"\n";
 
     // As before.
-    if(std::numeric_limits<T>::has_denorm) {
-        if(x1(std::numeric_limits<T>::denorm_min()) == x1(zero)) {
+    if(boost::hash_detail::limits<T>::has_denorm) {
+        if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(zero)) {
             std::cerr<<"x1(denorm_min) == x1(zero) == "<<x1(zero)<<"\n";
         }
 #if !BOOST_WORKAROUND(__DECCXX_VER,<70190006)
         // The Tru64/CXX standard library prior to 7.1 contains a bug in the
-        // specialization of std::numeric_limits::denorm_min() for long
+        // specialization of boost::hash_detail::limits::denorm_min() for long
         // doubles which causes this test to fail.
-        if(x1(std::numeric_limits<T>::denorm_min()) !=
-            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::denorm_min()))
+        if(x1(boost::hash_detail::limits<T>::denorm_min()) !=
+            HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::denorm_min()))
         {
-            std::cerr<<"x1(std::numeric_limits<T>::denorm_min()) = "
-                << x1(std::numeric_limits<T>::denorm_min())
-                << "\nhash_value(std::numeric_limits<T>::denorm_min()) = "
+            std::cerr<<"x1(boost::hash_detail::limits<T>::denorm_min()) = "
+                << x1(boost::hash_detail::limits<T>::denorm_min())
+                << "\nhash_value(boost::hash_detail::limits<T>::denorm_min()) = "
                 << HASH_NAMESPACE::hash_value(
-                        std::numeric_limits<T>::denorm_min())
+                        boost::hash_detail::limits<T>::denorm_min())
                 << "\nx1(0) = "<<x1(0)<<"\n";
         }
 #endif
@@ -193,12 +193,12 @@ void float_tests(char const* name, T* = 0)
 
 // NaN also causes borland to crash.
 #if !defined(__BORLANDC__)
-    if(std::numeric_limits<T>::has_quiet_NaN) {
-        if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(1.0)) {
+    if(boost::hash_detail::limits<T>::has_quiet_NaN) {
+        if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(1.0)) {
             std::cerr<<"x1(quiet_NaN) == x1(1.0) == "<<x1(1.0)<<"\n";
         }
-        BOOST_TEST(x1(std::numeric_limits<T>::quiet_NaN()) ==
-            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::quiet_NaN()));
+        BOOST_CHECK(x1(boost::hash_detail::limits<T>::quiet_NaN()) ==
+            HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::quiet_NaN()));
     }
 #endif
 }
diff --git a/hash/test/hash_friend_test.cpp b/hash/test/hash_friend_test.cpp
index 6c6596e..4253f03 100644
--- a/hash/test/hash_friend_test.cpp
+++ b/hash/test/hash_friend_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2007 Daniel James.
+// Copyright 2006-2008 Daniel James.
 // Distributed under 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)
 
@@ -50,7 +50,7 @@ namespace boost
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -61,13 +61,13 @@ namespace boost
 void custom_tests()
 {
     HASH_NAMESPACE::hash<test::custom<int> > custom_hasher;
-    BOOST_TEST(custom_hasher(10) == 100u);
+    BOOST_CHECK(custom_hasher(10) == 100u);
     test::custom<int> x(55);
-    BOOST_TEST(custom_hasher(x) == 550u);
+    BOOST_CHECK(custom_hasher(x) == 550u);
 
     {
         using namespace HASH_NAMESPACE;
-        BOOST_TEST(custom_hasher(x) == hash_value(x));
+        BOOST_CHECK(custom_hasher(x) == hash_value(x));
     }
 
     std::vector<test::custom<int> > custom_vector;
@@ -85,17 +85,17 @@ void custom_tests()
     HASH_NAMESPACE::hash_combine(seed2, 250u);
     HASH_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_TEST(seed ==
+    BOOST_CHECK(seed ==
             HASH_NAMESPACE::hash_range(custom_vector.begin(), custom_vector.end()));
-    BOOST_TEST(seed == seed2);
+    BOOST_CHECK(seed == seed2);
 }
 
 #endif // TEST_EXTENSIONS
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     custom_tests();
 #endif
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp
index 07a0300..f3b8111 100644
--- a/hash/test/hash_function_pointer_test.cpp
+++ b/hash/test/hash_function_pointer_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #include <boost/limits.hpp>
 #include <boost/mpl/assert.hpp>
@@ -32,31 +32,31 @@ void function_pointer_tests()
     HASH_NAMESPACE::hash<void(*)()> hasher_void;
     HASH_NAMESPACE::hash<int(*)(int)> hasher_int;
 
-    BOOST_TEST(&void_func1 != &void_func2);
-    BOOST_TEST(&int_func1 != &int_func2);
+    BOOST_CHECK(&void_func1 != &void_func2);
+    BOOST_CHECK(&int_func1 != &int_func2);
 
-    BOOST_TEST(hasher_void(0) == hasher_void(0));
-    BOOST_TEST(hasher_void(&void_func1) == hasher_void(&void_func1));
-    BOOST_TEST(hasher_void(&void_func1) != hasher_void(&void_func2));
-    BOOST_TEST(hasher_void(&void_func1) != hasher_void(0));
-    BOOST_TEST(hasher_int(0) == hasher_int(0));
-    BOOST_TEST(hasher_int(&int_func1) == hasher_int(&int_func1));
-    BOOST_TEST(hasher_int(&int_func1) != hasher_int(&int_func2));
-    BOOST_TEST(hasher_int(&int_func1) != hasher_int(0));
+    BOOST_CHECK(hasher_void(0) == hasher_void(0));
+    BOOST_CHECK(hasher_void(&void_func1) == hasher_void(&void_func1));
+    BOOST_CHECK(hasher_void(&void_func1) != hasher_void(&void_func2));
+    BOOST_CHECK(hasher_void(&void_func1) != hasher_void(0));
+    BOOST_CHECK(hasher_int(0) == hasher_int(0));
+    BOOST_CHECK(hasher_int(&int_func1) == hasher_int(&int_func1));
+    BOOST_CHECK(hasher_int(&int_func1) != hasher_int(&int_func2));
+    BOOST_CHECK(hasher_int(&int_func1) != hasher_int(0));
 #if defined(TEST_EXTENSIONS)
-    BOOST_TEST(hasher_void(&void_func1)
+    BOOST_CHECK(hasher_void(&void_func1)
             == HASH_NAMESPACE::hash_value(&void_func1));
-    BOOST_TEST(hasher_int(&int_func1)
+    BOOST_CHECK(hasher_int(&int_func1)
             == HASH_NAMESPACE::hash_value(&int_func1));
 
     // This isn't specified in Peter's proposal:
-    BOOST_TEST(hasher_void(0) == 0);
+    BOOST_CHECK(hasher_void(0) == 0);
 #endif
 }
 
-int main()
+int test_main(int, char**)
 {
     function_pointer_tests();
 
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_fwd_test.hpp b/hash/test/hash_fwd_test.hpp
index 30ad609..4822510 100644
--- a/hash/test/hash_fwd_test.hpp
+++ b/hash/test/hash_fwd_test.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2007 Daniel James.
+// Copyright 2006-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_fwd_test_1.cpp b/hash/test/hash_fwd_test_1.cpp
index e5106a3..b73c9ce 100644
--- a/hash/test/hash_fwd_test_1.cpp
+++ b/hash/test/hash_fwd_test_1.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2007 Daniel James.
+// Copyright 2006-2008 Daniel James.
 // Distributed under 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)
 
@@ -7,7 +7,7 @@
 
 #include "./hash_fwd_test.hpp"
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #if defined(TEST_EXTENSIONS) && !defined(TEST_STD_INCLUDES)
 
@@ -24,8 +24,8 @@ void fwd_test1()
     HASH_NAMESPACE::hash<test::test_type1<int> > hasher_test_int;
     HASH_NAMESPACE::hash<test::test_type1<std::string> > hasher_test_string;
 
-    BOOST_TEST(hasher_int(5) == hasher_test_int(x));
-    BOOST_TEST(hasher_string("Test") == hasher_test_string(y));
+    BOOST_CHECK(hasher_int(5) == hasher_test_int(x));
+    BOOST_CHECK(hasher_string("Test") == hasher_test_string(y));
 }
 
 void fwd_test2()
@@ -44,8 +44,8 @@ void fwd_test2()
     HASH_NAMESPACE::hash<test::test_type2<int> > hasher_test_int;
     HASH_NAMESPACE::hash<test::test_type2<std::string> > hasher_test_string;
 
-    BOOST_TEST(seed1 == hasher_test_int(x));
-    BOOST_TEST(seed2 == hasher_test_string(y));
+    BOOST_CHECK(seed1 == hasher_test_int(x));
+    BOOST_CHECK(seed2 == hasher_test_string(y));
 }
 
 void fwd_test3()
@@ -75,19 +75,19 @@ void fwd_test3()
     HASH_NAMESPACE::hash<test::test_type3<int> > hasher_test_int;
     HASH_NAMESPACE::hash<test::test_type3<std::string> > hasher_test_string;
 
-    BOOST_TEST(seed1 == hasher_test_int(x));
-    BOOST_TEST(seed2 == hasher_test_string(y));
+    BOOST_CHECK(seed1 == hasher_test_int(x));
+    BOOST_CHECK(seed2 == hasher_test_string(y));
 }
 
 #endif
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     fwd_test1();
     fwd_test2();
     fwd_test3();
 #endif
-    return boost::report_errors();
+    return 0;
 }
 
diff --git a/hash/test/hash_fwd_test_2.cpp b/hash/test/hash_fwd_test_2.cpp
index e334194..e5dcbae 100644
--- a/hash/test/hash_fwd_test_2.cpp
+++ b/hash/test/hash_fwd_test_2.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2007 Daniel James.
+// Copyright 2006-2008 Daniel James.
 // Distributed under 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)
 
@@ -8,7 +8,7 @@
 
 #include "./hash_fwd_test.hpp"
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 template <class T> void unused(T const&) {}
 
@@ -31,9 +31,9 @@ void fwd_test()
 }
 
 
-int main()
+int test_main(int, char**)
 {
     fwd_test();
-    return boost::report_errors();
+    return 0;
 }
 
diff --git a/hash/test/hash_global_namespace_test.cpp b/hash/test/hash_global_namespace_test.cpp
index a64f5eb..588e95a 100644
--- a/hash/test/hash_global_namespace_test.cpp
+++ b/hash/test/hash_global_namespace_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2007 Daniel James.
+// Copyright 2006-2008 Daniel James.
 // Distributed under 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)
 
@@ -48,7 +48,7 @@ namespace boost
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -59,13 +59,13 @@ namespace boost
 void custom_tests()
 {
     HASH_NAMESPACE::hash<custom> custom_hasher;
-    BOOST_TEST(custom_hasher(10) == 100u);
+    BOOST_CHECK(custom_hasher(10) == 100u);
     custom x(55);
-    BOOST_TEST(custom_hasher(x) == 550u);
+    BOOST_CHECK(custom_hasher(x) == 550u);
 
     {
         using namespace HASH_NAMESPACE;
-        BOOST_TEST(custom_hasher(x) == hash_value(x));
+        BOOST_CHECK(custom_hasher(x) == hash_value(x));
     }
 
     std::vector<custom> custom_vector;
@@ -83,19 +83,19 @@ void custom_tests()
     HASH_NAMESPACE::hash_combine(seed2, 250u);
     HASH_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_TEST(seed ==
+    BOOST_CHECK(seed ==
             HASH_NAMESPACE::hash_range(custom_vector.begin(), custom_vector.end()));
-    BOOST_TEST(seed == seed2);
+    BOOST_CHECK(seed == seed2);
 }
 
 #endif // TEST_EXTENSIONS
 
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     custom_tests();
 #endif
-    return boost::report_errors();
+    return 0;
 }
 
diff --git a/hash/test/hash_list_test.cpp b/hash/test/hash_list_test.cpp
index f61b6c4..ca99c67 100644
--- a/hash/test/hash_list_test.cpp
+++ b/hash/test/hash_list_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -25,11 +25,11 @@ using std::list;
 
 #endif // TEST_EXTENSIONS
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     list_tests::list_hash_integer_tests();
 #endif
 
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_long_double_test.cpp b/hash/test/hash_long_double_test.cpp
index 1c3aa74..03c22c4 100644
--- a/hash/test/hash_long_double_test.cpp
+++ b/hash/test/hash_long_double_test.cpp
@@ -1,11 +1,11 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
 #include "hash_float_test.hpp"
 
-int main()
+int test_main(int, char**)
 {
     std::cerr<<"Compiler: "<<BOOST_COMPILER<<"\n";
     std::cerr<<"Platform: "<<BOOST_PLATFORM<<"\n";
@@ -13,5 +13,5 @@ int main()
 
     float_tests("long double", (long double*) 0);
 
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_map_test.cpp b/hash/test/hash_map_test.cpp
index cbc9c50..1df1543 100644
--- a/hash/test/hash_map_test.cpp
+++ b/hash/test/hash_map_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #include <map>
 
@@ -29,12 +29,12 @@ using std::multimap;
 
 #endif // TEST_EXTENSTIONS
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     map_tests::map_hash_integer_tests();
     multimap_tests::multimap_hash_integer_tests();
 #endif
 
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp
index 1a56282..8b7846d 100644
--- a/hash/test/hash_map_test.hpp
+++ b/hash/test/hash_map_test.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -38,17 +38,17 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         HASH_NAMESPACE::hash<T> hasher;
 
         for(int i2 = 0; i2 < number_of_containers; ++i2) {
-            BOOST_TEST(hasher(containers[i2]) == hasher(containers[i2]));
+            BOOST_CHECK(hasher(containers[i2]) == hasher(containers[i2]));
 
-            BOOST_TEST(hasher(containers[i2]) ==
+            BOOST_CHECK(hasher(containers[i2]) ==
                     HASH_NAMESPACE::hash_value(containers[i2]));
 
-            BOOST_TEST(hasher(containers[i2])
+            BOOST_CHECK(hasher(containers[i2])
                     == HASH_NAMESPACE::hash_range(
                         containers[i2].begin(), containers[i2].end()));
 
             for(int j2 = i2 + 1; j2 < number_of_containers; ++j2) {
-                BOOST_TEST(
+                BOOST_CHECK(
                         (containers[i2] == containers[j2]) ==
                         (hasher(containers[i2]) == hasher(containers[j2]))
                         );
diff --git a/hash/test/hash_no_ext_fail_test.cpp b/hash/test/hash_no_ext_fail_test.cpp
index bd123a9..c5ddc14 100644
--- a/hash/test/hash_no_ext_fail_test.cpp
+++ b/hash/test/hash_no_ext_fail_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2007 Daniel James.
+// Copyright 2006-2008 Daniel James.
 // Distributed under 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)
 
@@ -12,7 +12,7 @@
 #include <boost/functional/hash.hpp>
 #include <boost/functional/hash.hpp>
 
-int main()
+int test_main(int, char**)
 {
     HASH_NAMESPACE::hash< int[10] > hasher;
     return 0;
diff --git a/hash/test/hash_no_ext_macro_1.cpp b/hash/test/hash_no_ext_macro_1.cpp
index c0f84ae..20a74e6 100644
--- a/hash/test/hash_no_ext_macro_1.cpp
+++ b/hash/test/hash_no_ext_macro_1.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2007 Daniel James.
+// Copyright 2006-2008 Daniel James.
 // Distributed under 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)
 
@@ -7,11 +7,11 @@
 #include <boost/functional/hash.hpp>
 #define BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 #include <deque>
 #include <cassert>
 
-int main()
+int test_main(int, char**)
 {
     std::deque<int> x;
 
@@ -19,7 +19,7 @@ int main()
     x.push_back(2);
 
     HASH_NAMESPACE::hash<std::deque<int> > hasher;
-    BOOST_TEST(hasher(x) == HASH_NAMESPACE::hash_value(x));
+    BOOST_CHECK(hasher(x) == HASH_NAMESPACE::hash_value(x));
 
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_no_ext_macro_2.cpp b/hash/test/hash_no_ext_macro_2.cpp
index 75b05d7..8c80667 100644
--- a/hash/test/hash_no_ext_macro_2.cpp
+++ b/hash/test/hash_no_ext_macro_2.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2007 Daniel James.
+// Copyright 2006-2008 Daniel James.
 // Distributed under 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)
 
@@ -8,10 +8,10 @@
 #include <boost/functional/hash.hpp>
 #undef BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 #include <map>
 
-int main()
+int test_main(int, char**)
 {
     std::map<int, int> x;
 
@@ -19,7 +19,7 @@ int main()
     x.insert(std::map<int, int>::value_type(14, -75));
 
     HASH_NAMESPACE::hash<std::map<int, int> > hasher;
-    BOOST_TEST(hasher(x) == HASH_NAMESPACE::hash_value(x));
+    BOOST_CHECK(hasher(x) == HASH_NAMESPACE::hash_value(x));
     
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index 89910a2..e21674f 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -12,7 +12,7 @@
 #endif
 
 #include <iostream>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/limits.hpp>
@@ -31,7 +31,7 @@
 template <class T>
 void numeric_test(T*)
 {
-    typedef std::numeric_limits<T> limits;
+    typedef boost::hash_detail::limits<T> limits;
 
     compile_time_tests((T*) 0);
 
@@ -39,27 +39,27 @@ void numeric_test(T*)
     HASH_NAMESPACE::hash<T> x2;
 
     T v1 = (T) -5;
-    BOOST_TEST(x1(v1) == x2(v1));
-    BOOST_TEST(x1(T(-5)) == x2(T(-5)));
-    BOOST_TEST(x1(T(0)) == x2(T(0)));
-    BOOST_TEST(x1(T(10)) == x2(T(10)));
-    BOOST_TEST(x1(T(25)) == x2(T(25)));
-    BOOST_TEST(x1(T(5) - T(5)) == x2(T(0)));
-    BOOST_TEST(x1(T(6) + T(4)) == x2(T(10)));
+    BOOST_CHECK(x1(v1) == x2(v1));
+    BOOST_CHECK(x1(T(-5)) == x2(T(-5)));
+    BOOST_CHECK(x1(T(0)) == x2(T(0)));
+    BOOST_CHECK(x1(T(10)) == x2(T(10)));
+    BOOST_CHECK(x1(T(25)) == x2(T(25)));
+    BOOST_CHECK(x1(T(5) - T(5)) == x2(T(0)));
+    BOOST_CHECK(x1(T(6) + T(4)) == x2(T(10)));
 
 #if defined(TEST_EXTENSIONS)
-    BOOST_TEST(x1(T(-5)) == HASH_NAMESPACE::hash_value(T(-5)));
-    BOOST_TEST(x1(T(0)) == HASH_NAMESPACE::hash_value(T(0)));
-    BOOST_TEST(x1(T(10)) == HASH_NAMESPACE::hash_value(T(10)));
-    BOOST_TEST(x1(T(25)) == HASH_NAMESPACE::hash_value(T(25)));
+    BOOST_CHECK(x1(T(-5)) == HASH_NAMESPACE::hash_value(T(-5)));
+    BOOST_CHECK(x1(T(0)) == HASH_NAMESPACE::hash_value(T(0)));
+    BOOST_CHECK(x1(T(10)) == HASH_NAMESPACE::hash_value(T(10)));
+    BOOST_CHECK(x1(T(25)) == HASH_NAMESPACE::hash_value(T(25)));
 
     if (limits::is_integer)
     {
-        if(limits::is_signed || limits::digits <= std::numeric_limits<std::size_t>::digits)
-            BOOST_TEST(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
-        BOOST_TEST(HASH_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
-        BOOST_TEST(HASH_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
-        BOOST_TEST(HASH_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
+        if(limits::is_signed || limits::digits <= boost::hash_detail::limits<std::size_t>::digits)
+            BOOST_CHECK(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
+        BOOST_CHECK(HASH_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
+        BOOST_CHECK(HASH_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
+        BOOST_CHECK(HASH_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
     }
 #endif
 }
@@ -67,7 +67,7 @@ void numeric_test(T*)
 template <class T>
 void limits_test(T*)
 {
-    typedef std::numeric_limits<T> limits;
+    typedef boost::hash_detail::limits<T> limits;
 
     if(limits::is_specialized)
     {
@@ -77,18 +77,18 @@ void limits_test(T*)
         T min_value = (limits::min)();
         T max_value = (limits::max)();
 
-        BOOST_TEST(x1(min_value) == x2((limits::min)()));
-        BOOST_TEST(x1(max_value) == x2((limits::max)()));
+        BOOST_CHECK(x1(min_value) == x2((limits::min)()));
+        BOOST_CHECK(x1(max_value) == x2((limits::max)()));
 
 #if defined(TEST_EXTENSIONS)
-        BOOST_TEST(x1(min_value) == HASH_NAMESPACE::hash_value(min_value));
-        BOOST_TEST(x1(max_value) == HASH_NAMESPACE::hash_value(max_value));
+        BOOST_CHECK(x1(min_value) == HASH_NAMESPACE::hash_value(min_value));
+        BOOST_CHECK(x1(max_value) == HASH_NAMESPACE::hash_value(max_value));
 
         if (limits::is_integer)
         {
-            BOOST_TEST(HASH_NAMESPACE::hash_value(min_value)
+            BOOST_CHECK(HASH_NAMESPACE::hash_value(min_value)
                     == std::size_t(min_value));
-            BOOST_TEST(HASH_NAMESPACE::hash_value(max_value)
+            BOOST_CHECK(HASH_NAMESPACE::hash_value(max_value)
                     == std::size_t(max_value));
         }
 #endif
@@ -98,7 +98,7 @@ void limits_test(T*)
 template <class T>
 void poor_quality_tests(T*)
 {
-    typedef std::numeric_limits<T> limits;
+    typedef boost::hash_detail::limits<T> limits;
 
     HASH_NAMESPACE::hash<T> x1;
     HASH_NAMESPACE::hash<T> x2;
@@ -106,11 +106,11 @@ void poor_quality_tests(T*)
     // A hash function can legally fail these tests, but it'll not be a good
     // sign.
     if(T(1) != T(-1))
-        BOOST_TEST(x1(T(1)) !=  x2(T(-1)));
+        BOOST_CHECK(x1(T(1)) !=  x2(T(-1)));
     if(T(1) != T(2))
-        BOOST_TEST(x1(T(1)) !=  x2(T(2)));
+        BOOST_CHECK(x1(T(1)) !=  x2(T(2)));
     if((limits::max)() != (limits::max)() - 1)
-        BOOST_TEST(x1((limits::max)()) != x2((limits::max)() - 1));
+        BOOST_CHECK(x1((limits::max)()) != x2((limits::max)() - 1));
 }
 
 void bool_test()
@@ -118,10 +118,10 @@ void bool_test()
     HASH_NAMESPACE::hash<bool> x1;
     HASH_NAMESPACE::hash<bool> x2;
     
-    BOOST_TEST(x1(true) == x2(true));
-    BOOST_TEST(x1(false) == x2(false));
-    BOOST_TEST(x1(true) != x2(false));
-    BOOST_TEST(x1(false) != x2(true));
+    BOOST_CHECK(x1(true) == x2(true));
+    BOOST_CHECK(x1(false) == x2(false));
+    BOOST_CHECK(x1(true) != x2(false));
+    BOOST_CHECK(x1(false) != x2(true));
 }
 
 #define NUMERIC_TEST(type, name) \
@@ -134,7 +134,7 @@ void bool_test()
     numeric_test((type*) 0); \
     poor_quality_tests((type*) 0);
 
-int main()
+int test_main(int, char**)
 {
     NUMERIC_TEST(char, char)
     NUMERIC_TEST(signed char, schar)
@@ -150,8 +150,8 @@ int main()
     NUMERIC_TEST(unsigned long, ulong)
 
 #if defined(BOOST_HAS_LONG_LONG)
-    NUMERIC_TEST_NO_LIMITS(long long, hash_longlong)
-    NUMERIC_TEST_NO_LIMITS(unsigned long long, ulonglong)
+    NUMERIC_TEST_NO_LIMITS(boost::long_long_type, long_long)
+    NUMERIC_TEST_NO_LIMITS(boost::ulong_long_type, ulong_long)
 #endif
 
     NUMERIC_TEST(float, float)
@@ -159,7 +159,7 @@ int main()
 
     bool_test();
 
-    return boost::report_errors();
+    return 0;
 }
 
 #if defined(BOOST_MSVC)
diff --git a/hash/test/hash_pointer_test.cpp b/hash/test/hash_pointer_test.cpp
index 78d3416..ca893a6 100644
--- a/hash/test/hash_pointer_test.cpp
+++ b/hash/test/hash_pointer_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #include <boost/limits.hpp>
 #include <boost/mpl/assert.hpp>
@@ -30,20 +30,20 @@ void pointer_tests()
     int int1;
     int int2;
 
-    BOOST_TEST(x1(0) == x2(0));
-    BOOST_TEST(x1(&int1) == x2(&int1));
-    BOOST_TEST(x1(&int2) == x2(&int2));
+    BOOST_CHECK(x1(0) == x2(0));
+    BOOST_CHECK(x1(&int1) == x2(&int1));
+    BOOST_CHECK(x1(&int2) == x2(&int2));
 #if defined(TEST_EXTENSIONS)
-    BOOST_TEST(x1(&int1) == HASH_NAMESPACE::hash_value(&int1));
-    BOOST_TEST(x1(&int2) == HASH_NAMESPACE::hash_value(&int2));
+    BOOST_CHECK(x1(&int1) == HASH_NAMESPACE::hash_value(&int1));
+    BOOST_CHECK(x1(&int2) == HASH_NAMESPACE::hash_value(&int2));
 
     // This isn't specified in Peter's proposal:
-    BOOST_TEST(x1(0) == 0);
+    BOOST_CHECK(x1(0) == 0);
 #endif
 }
 
-int main()
+int test_main(int, char**)
 {
     pointer_tests();
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index 9e5ef09..94af3e6 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -41,45 +41,45 @@ void hash_range_tests()
     std::vector<int> x;
 
     std::size_t x_seed = 0;
-    BOOST_TEST(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_CHECK(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
-    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
+    BOOST_CHECK(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
         == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
+    BOOST_CHECK(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
         != HASH_NAMESPACE::hash_range(values1.begin(), values1.end()));
 
     x.push_back(10);
     HASH_NAMESPACE::hash_combine(x_seed, 10);
-    BOOST_TEST(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_CHECK(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
-    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
+    BOOST_CHECK(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
         != HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_range(values2.begin(), values2.end())
+    BOOST_CHECK(HASH_NAMESPACE::hash_range(values2.begin(), values2.end())
         == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
     x.push_back(20);
     HASH_NAMESPACE::hash_combine(x_seed, 20);
-    BOOST_TEST(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_CHECK(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
-    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
+    BOOST_CHECK(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
         != HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_range(values2.begin(), values2.end())
+    BOOST_CHECK(HASH_NAMESPACE::hash_range(values2.begin(), values2.end())
         != HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_range(values3.begin(), values3.end())
+    BOOST_CHECK(HASH_NAMESPACE::hash_range(values3.begin(), values3.end())
         == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
     std::size_t seed = HASH_NAMESPACE::hash_range(values3.begin(), values3.end());
     HASH_NAMESPACE::hash_range(seed, values4.begin(), values4.end());
     HASH_NAMESPACE::hash_range(seed, x.begin(), x.end());
-    BOOST_TEST(seed == HASH_NAMESPACE::hash_range(values5.begin(), values5.end()));
+    BOOST_CHECK(seed == HASH_NAMESPACE::hash_range(values5.begin(), values5.end()));
 }
 
 #endif
 
-int main()
+int test_main(int, char**)
 {
     hash_range_tests();
 
-    return boost::report_errors();
+    return 0;
 }
 
diff --git a/hash/test/hash_sequence_test.hpp b/hash/test/hash_sequence_test.hpp
index eb3295c..e2920ba 100644
--- a/hash/test/hash_sequence_test.hpp
+++ b/hash/test/hash_sequence_test.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -41,17 +41,17 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         HASH_NAMESPACE::hash<T> hasher;
 
         for(int i2 = 0; i2 < number_of_containers; ++i2) {
-            BOOST_TEST(hasher(containers[i2]) == hasher(containers[i2]));
+            BOOST_CHECK(hasher(containers[i2]) == hasher(containers[i2]));
 
-            BOOST_TEST(hasher(containers[i2]) ==
+            BOOST_CHECK(hasher(containers[i2]) ==
                     HASH_NAMESPACE::hash_value(containers[i2]));
 
-            BOOST_TEST(hasher(containers[i2])
+            BOOST_CHECK(hasher(containers[i2])
                     == HASH_NAMESPACE::hash_range(
                         containers[i2].begin(), containers[i2].end()));
 
             for(int j2 = i2 + 1; j2 < number_of_containers; ++j2) {
-                BOOST_TEST(
+                BOOST_CHECK(
                         (containers[i2] == containers[j2]) ==
                         (hasher(containers[i2]) == hasher(containers[j2]))
                         );
diff --git a/hash/test/hash_set_test.cpp b/hash/test/hash_set_test.cpp
index 442291c..40f5dc3 100644
--- a/hash/test/hash_set_test.cpp
+++ b/hash/test/hash_set_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -29,12 +29,12 @@ using std::multiset;
 
 #endif
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     set_tests::set_hash_integer_tests();
     multiset_tests::multiset_hash_integer_tests();
 #endif
 
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_set_test.hpp b/hash/test/hash_set_test.hpp
index 50791a6..18aa654 100644
--- a/hash/test/hash_set_test.hpp
+++ b/hash/test/hash_set_test.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -44,17 +44,17 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         HASH_NAMESPACE::hash<T> hasher;
 
         for(int i2 = 0; i2 < number_of_containers; ++i2) {
-            BOOST_TEST(hasher(containers[i2]) == hasher(containers[i2]));
+            BOOST_CHECK(hasher(containers[i2]) == hasher(containers[i2]));
 
-            BOOST_TEST(hasher(containers[i2]) ==
+            BOOST_CHECK(hasher(containers[i2]) ==
                     HASH_NAMESPACE::hash_value(containers[i2]));
 
-            BOOST_TEST(hasher(containers[i2])
+            BOOST_CHECK(hasher(containers[i2])
                     == HASH_NAMESPACE::hash_range(
                         containers[i2].begin(), containers[i2].end()));
 
             for(int j2 = i2 + 1; j2 < number_of_containers; ++j2) {
-                BOOST_TEST(
+                BOOST_CHECK(
                         (containers[i2] == containers[j2]) ==
                         (hasher(containers[i2]) == hasher(containers[j2]))
                         );
diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp
index 42ca0b7..34654ee 100644
--- a/hash/test/hash_string_test.cpp
+++ b/hash/test/hash_string_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #include <boost/limits.hpp>
 #include <boost/mpl/assert.hpp>
@@ -27,18 +27,18 @@ void string_tests()
     HASH_NAMESPACE::hash<std::string> x1;
     HASH_NAMESPACE::hash<std::string> x2;
 
-    BOOST_TEST(x1("Hello") == x2(std::string("Hel") + "lo"));
-    BOOST_TEST(x1("") == x2(std::string()));
+    BOOST_CHECK(x1("Hello") == x2(std::string("Hel") + "lo"));
+    BOOST_CHECK(x1("") == x2(std::string()));
 
 #if defined(TEST_EXTENSIONS)
     std::string value1;
     std::string value2("Hello");
 
-    BOOST_TEST(x1(value1) == HASH_NAMESPACE::hash_value(value1));
-    BOOST_TEST(x1(value2) == HASH_NAMESPACE::hash_value(value2));
-    BOOST_TEST(HASH_NAMESPACE::hash_value(value1) ==
+    BOOST_CHECK(x1(value1) == HASH_NAMESPACE::hash_value(value1));
+    BOOST_CHECK(x1(value2) == HASH_NAMESPACE::hash_value(value2));
+    BOOST_CHECK(HASH_NAMESPACE::hash_value(value1) ==
             HASH_NAMESPACE::hash_range(value1.begin(), value1.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_value(value2) ==
+    BOOST_CHECK(HASH_NAMESPACE::hash_value(value2) ==
             HASH_NAMESPACE::hash_range(value2.begin(), value2.end()));
 #endif
 }
@@ -51,28 +51,28 @@ void wstring_tests()
     HASH_NAMESPACE::hash<std::wstring> x1;
     HASH_NAMESPACE::hash<std::wstring> x2;
 
-    BOOST_TEST(x1(L"Hello") == x2(std::wstring(L"Hel") + L"lo"));
-    BOOST_TEST(x1(L"") == x2(std::wstring()));
+    BOOST_CHECK(x1(L"Hello") == x2(std::wstring(L"Hel") + L"lo"));
+    BOOST_CHECK(x1(L"") == x2(std::wstring()));
 
 #if defined(TEST_EXTENSIONS)
     std::wstring value1;
     std::wstring value2(L"Hello");
 
-    BOOST_TEST(x1(value1) == HASH_NAMESPACE::hash_value(value1));
-    BOOST_TEST(x1(value2) == HASH_NAMESPACE::hash_value(value2));
-    BOOST_TEST(HASH_NAMESPACE::hash_value(value1) ==
+    BOOST_CHECK(x1(value1) == HASH_NAMESPACE::hash_value(value1));
+    BOOST_CHECK(x1(value2) == HASH_NAMESPACE::hash_value(value2));
+    BOOST_CHECK(HASH_NAMESPACE::hash_value(value1) ==
             HASH_NAMESPACE::hash_range(value1.begin(), value1.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_value(value2) ==
+    BOOST_CHECK(HASH_NAMESPACE::hash_value(value2) ==
             HASH_NAMESPACE::hash_range(value2.begin(), value2.end()));
 #endif
 }
 #endif
 
-int main()
+int test_main(int, char**)
 {
     string_tests();
 #if !defined(BOOST_NO_STD_WSTRING)
     wstring_tests();
 #endif
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/hash_value_array_test.cpp b/hash/test/hash_value_array_test.cpp
index 7080665..240f0f0 100644
--- a/hash/test/hash_value_array_test.cpp
+++ b/hash/test/hash_value_array_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -16,7 +16,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -37,9 +37,9 @@ void array_int_test()
     int array3[2] = {2, 3};
     HASH_NAMESPACE::hash<int[2]> hasher3;
 
-    BOOST_TEST(hasher1(array1) == HASH_NAMESPACE::hash_value(array1));
-    BOOST_TEST(hasher2(array2) == HASH_NAMESPACE::hash_value(array2));
-    BOOST_TEST(hasher3(array3) == HASH_NAMESPACE::hash_value(array3));
+    BOOST_CHECK(hasher1(array1) == HASH_NAMESPACE::hash_value(array1));
+    BOOST_CHECK(hasher2(array2) == HASH_NAMESPACE::hash_value(array2));
+    BOOST_CHECK(hasher3(array3) == HASH_NAMESPACE::hash_value(array3));
 }
 
 void two_dimensional_array_test()
@@ -47,18 +47,18 @@ void two_dimensional_array_test()
     int array[3][2] = {{-5, 6}, {7, -3}, {26, 1}};
     HASH_NAMESPACE::hash<int[3][2]> hasher;
 
-    BOOST_TEST(hasher(array) == HASH_NAMESPACE::hash_value(array));
+    BOOST_CHECK(hasher(array) == HASH_NAMESPACE::hash_value(array));
 }
 
 #endif
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     array_int_test();
     two_dimensional_array_test();
 #endif
 
-    return boost::report_errors();
+    return 0;
 }
 
diff --git a/hash/test/hash_vector_test.cpp b/hash/test/hash_vector_test.cpp
index bcc9c51..d5c25e2 100644
--- a/hash/test/hash_vector_test.cpp
+++ b/hash/test/hash_vector_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -25,11 +25,11 @@ using std::vector;
 
 #endif // TEST_EXTENSIONS
 
-int main()
+int test_main(int, char**)
 {
 #ifdef TEST_EXTENSIONS
     vector_tests::vector_hash_integer_tests();
 #endif
 
-    return boost::report_errors();
+    return 0;
 }
diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp
index 19a7299..d65c3bb 100644
--- a/hash/test/link_ext_test.cpp
+++ b/hash/test/link_ext_test.cpp
@@ -1,17 +1,17 @@
 
-// Copyright 2006-2007 Daniel James.
+// Copyright 2006-2008 Daniel James.
 // Distributed under 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)
 
 #define HASH_NAMESPACE boost
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/test/minimal.hpp>
 #include <vector>
 
 int f(std::size_t hash1, int* x1) {
     // Check that HASH_NAMESPACE::hash<int*> works in both files.
     HASH_NAMESPACE::hash<int*> ptr_hasher;
-    BOOST_TEST(hash1 == ptr_hasher(x1));
+    BOOST_CHECK(hash1 == ptr_hasher(x1));
 
     // Check that std::vector<std::size_t> is avaiable in this file.
     std::vector<std::size_t> x;
diff --git a/hash/test/link_no_ext_test.cpp b/hash/test/link_no_ext_test.cpp
index a3db5b1..102d8fd 100644
--- a/hash/test/link_no_ext_test.cpp
+++ b/hash/test/link_no_ext_test.cpp
@@ -1,18 +1,19 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
 #define HASH_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/assert.hpp>
 
 extern int f(std::size_t, int*);
 
-int main() {
+int test_main(int, char**) {
     HASH_NAMESPACE::hash<int*> ptr_hasher;
     int x = 55;
-    BOOST_TEST(!f(ptr_hasher(&x), &x));
-    return boost::report_errors();
+
+    BOOST_ASSERT(!f(ptr_hasher(&x), &x));
+    return 0;
 }
diff --git a/hash/test/link_test.cpp b/hash/test/link_test.cpp
index eb8e51f..756d6c8 100644
--- a/hash/test/link_test.cpp
+++ b/hash/test/link_test.cpp
@@ -1,9 +1,9 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
 #include <boost/functional/hash.hpp>
 
 extern int f();
-int main() { return f(); }
+int main(int, char**) { return f(); }
diff --git a/hash/test/link_test_2.cpp b/hash/test/link_test_2.cpp
index d40f1db..8be1635 100644
--- a/hash/test/link_test_2.cpp
+++ b/hash/test/link_test_2.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/detail/container_fwd.hpp b/include/boost/functional/detail/container_fwd.hpp
index f3f82f2..8685905 100644
--- a/include/boost/functional/detail/container_fwd.hpp
+++ b/include/boost/functional/detail/container_fwd.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/detail/float_functions.hpp b/include/boost/functional/detail/float_functions.hpp
index 9aac5a2..72386ad 100644
--- a/include/boost/functional/detail/float_functions.hpp
+++ b/include/boost/functional/detail/float_functions.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/detail/hash_float.hpp b/include/boost/functional/detail/hash_float.hpp
index 298d0c0..dc35afb 100644
--- a/include/boost/functional/detail/hash_float.hpp
+++ b/include/boost/functional/detail/hash_float.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -38,7 +38,7 @@
 
 // STLport
 #elif defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
-// _fpclass and fpclassify aren't good enough on STLport.
+// fpclassify aren't good enough on STLport.
 
 // GNU libstdc++ 3
 #elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
@@ -50,19 +50,47 @@
 // Dinkumware Library, on Visual C++ 
 #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
 
-// Not using _fpclass because it causes a warning about a conversion
-// from 'long double' to 'double'. Pity.
-// 
-//#  if defined(BOOST_MSVC)
-//#    define BOOST_HASH_USE_FPCLASS
-//#  endif
+// Not using _fpclass because it is only available for double.
 
 #endif
 
+// On OpenBSD, numeric_limits is not reliable for long doubles, but
+// the macros defined in <float.h> are.
+
+#if defined(__OpenBSD__)
+#include <float.h>
+#endif
+
 namespace boost
 {
     namespace hash_detail
     {
+        template <class T>
+        struct limits : std::numeric_limits<T> {};
+
+#if defined(__OpenBSD__)
+        template <>
+        struct limits<long double>
+             : std::numeric_limits<long double>
+        {
+            static long double epsilon() {
+                return LDBL_EPSILON;
+            }
+
+            static long double (max)() {
+                return LDBL_MAX;
+            }
+
+            static long double (min)() {
+                return LDBL_MIN;
+            }
+
+            BOOST_STATIC_CONSTANT(int, digits = LDBL_MANT_DIG);
+            BOOST_STATIC_CONSTANT(int, max_exponent = LDBL_MAX_EXP);
+            BOOST_STATIC_CONSTANT(int, min_exponent = LDBL_MIN_EXP);
+        };
+#endif // __OpenBSD__
+
         inline void hash_float_combine(std::size_t& seed, std::size_t value)
         {
             seed ^= value + (seed<<6) + (seed>>2);
@@ -107,29 +135,28 @@ namespace boost
             // sign with the exponent.
             if(v < 0) {
                 v = -v;
-                exp += std::numeric_limits<T>::max_exponent -
-                    std::numeric_limits<T>::min_exponent;
+                exp += limits<T>::max_exponent -
+                    limits<T>::min_exponent;
             }
 
             // The result of frexp is always between 0.5 and 1, so its
             // top bit will always be 1. Subtract by 0.5 to remove that.
             v -= T(0.5);
             v = boost::hash_detail::call_ldexp(v,
-                    std::numeric_limits<std::size_t>::digits + 1);
+                    limits<std::size_t>::digits + 1);
             std::size_t seed = static_cast<std::size_t>(v);
             v -= seed;
 
             // ceiling(digits(T) * log2(radix(T))/ digits(size_t)) - 1;
             std::size_t const length
-                = (std::numeric_limits<T>::digits *
-                        boost::static_log2<std::numeric_limits<T>::radix>::value
-                        - 1)
-                / std::numeric_limits<std::size_t>::digits;
+                = (limits<T>::digits *
+                        boost::static_log2<limits<T>::radix>::value - 1)
+                / limits<std::size_t>::digits;
 
             for(std::size_t i = 0; i != length; ++i)
             {
                 v = boost::hash_detail::call_ldexp(v,
-                        std::numeric_limits<std::size_t>::digits);
+                        limits<std::size_t>::digits);
                 std::size_t part = static_cast<std::size_t>(v);
                 v -= part;
                 hash_float_combine(seed, part);
@@ -160,28 +187,6 @@ namespace boost
                 BOOST_ASSERT(0);
                 return 0;
             }
-#elif defined(BOOST_HASH_USE_FPCLASS)
-            switch(_fpclass(v)) {
-            case _FPCLASS_NZ:
-            case _FPCLASS_PZ:
-                return 0;
-            case _FPCLASS_PINF:
-                return (std::size_t)(-1);
-            case _FPCLASS_NINF:
-                return (std::size_t)(-2);
-            case _FPCLASS_SNAN:
-            case _FPCLASS_QNAN:
-                return (std::size_t)(-3);
-            case _FPCLASS_NN:
-            case _FPCLASS_ND:
-                return float_hash_impl(v);
-            case _FPCLASS_PD:
-            case _FPCLASS_PN:
-                return float_hash_impl(v);
-            default:
-                BOOST_ASSERT(0);
-                return 0;
-            }
 #else
             return v == 0 ? 0 : float_hash_impl(v);
 #endif
diff --git a/include/boost/functional/hash.hpp b/include/boost/functional/hash.hpp
index 60b2608..46b611b 100644
--- a/include/boost/functional/hash.hpp
+++ b/include/boost/functional/hash.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -8,3 +8,4 @@
 //  issue 6.18. 
 
 #include <boost/functional/hash/hash.hpp>
+
diff --git a/include/boost/functional/hash/deque.hpp b/include/boost/functional/hash/deque.hpp
index 8e92727..06d23c2 100644
--- a/include/boost/functional/hash/deque.hpp
+++ b/include/boost/functional/hash/deque.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp
new file mode 100644
index 0000000..b9d868e
--- /dev/null
+++ b/include/boost/functional/hash/extensions.hpp
@@ -0,0 +1,182 @@
+
+// Copyright 2005-2008 Daniel James.
+// Distributed under 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)
+
+//  Based on Peter Dimov's proposal
+//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
+//  issue 6.18. 
+
+#if !defined(BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP)
+#define BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+namespace boost
+{
+
+#if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
+    namespace hash_detail
+    {
+        template <bool IsArray>
+        struct call_hash_impl
+        {
+            template <class T>
+            struct inner
+            {
+                static std::size_t call(T const& v)
+                {
+                    using namespace boost;
+                    return hash_value(v);
+                }
+            };
+        };
+
+        template <>
+        struct call_hash_impl<true>
+        {
+            template <class Array>
+            struct inner
+            {
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+                static std::size_t call(Array const& v)
+#else
+                static std::size_t call(Array& v)
+#endif
+                {
+                    const int size = sizeof(v) / sizeof(*v);
+                    return boost::hash_range(v, v + size);
+                }
+            };
+        };
+
+        template <class T>
+        struct call_hash
+            : public call_hash_impl<boost::is_array<T>::value>
+                ::BOOST_NESTED_TEMPLATE inner<T>
+        {
+        };
+    }
+#endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+
+#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+
+    template <class T> struct hash
+        : std::unary_function<T, std::size_t>
+    {
+#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
+        std::size_t operator()(T const& val) const
+        {
+            return hash_value(val);
+        }
+#else
+        std::size_t operator()(T const& val) const
+        {
+            return hash_detail::call_hash<T>::call(val);
+        }
+#endif
+    };
+
+#if BOOST_WORKAROUND(__DMC__, <= 0x848)
+    template <class T, unsigned int n> struct hash<T[n]>
+        : std::unary_function<T[n], std::size_t>
+    {
+        std::size_t operator()(const T* val) const
+        {
+            return boost::hash_range(val, val+n);
+        }
+    };
+#endif
+
+#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+    // On compilers without partial specialization, boost::hash<T>
+    // has already been declared to deal with pointers, so just
+    // need to supply the non-pointer version.
+
+    namespace hash_detail
+    {
+        template <bool IsPointer>
+        struct hash_impl;
+
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+
+        template <>
+        struct hash_impl<false>
+        {
+            template <class T>
+            struct inner
+                : std::unary_function<T, std::size_t>
+            {
+#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
+                std::size_t operator()(T const& val) const
+                {
+                    return hash_value(val);
+                }
+#else
+                std::size_t operator()(T const& val) const
+                {
+                    return hash_detail::call_hash<T>::call(val);
+                }
+#endif
+            };
+        };
+
+#else // Visual C++ 6.5
+
+    // There's probably a more elegant way to Visual C++ 6.5 to work
+    // but I don't know what it is.
+
+        template <bool IsConst>
+        struct hash_impl_msvc
+        {
+            template <class T>
+            struct inner
+                : public std::unary_function<T, std::size_t>
+            {
+                std::size_t operator()(T const& val) const
+                {
+                    return hash_detail::call_hash<T const>::call(val);
+                }
+
+                std::size_t operator()(T& val) const
+                {
+                    return hash_detail::call_hash<T>::call(val);
+                }
+            };
+        };
+
+        template <>
+        struct hash_impl_msvc<true>
+        {
+            template <class T>
+            struct inner
+                : public std::unary_function<T, std::size_t>
+            {
+                std::size_t operator()(T& val) const
+                {
+                    return hash_detail::call_hash<T>::call(val);
+                }
+            };
+        };
+        
+        template <class T>
+        struct hash_impl_msvc2
+            : public hash_impl_msvc<boost::is_const<T>::value>
+                    ::BOOST_NESTED_TEMPLATE inner<T> {};
+        
+        template <>
+        struct hash_impl<false>
+        {
+            template <class T>
+            struct inner : public hash_impl_msvc2<T> {};
+        };
+
+#endif // Visual C++ 6.5
+    }
+#endif  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+}
+
+#endif
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 5515efd..09ca567 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
@@ -46,8 +46,8 @@ namespace boost
 #endif
     
 #if defined(BOOST_HAS_LONG_LONG)
-    std::size_t hash_value(long long);
-    std::size_t hash_value(unsigned long long);
+    std::size_t hash_value(boost::long_long_type);
+    std::size_t hash_value(boost::ulong_long_type);
 #endif
 
 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
@@ -195,12 +195,12 @@ namespace boost
 #endif
 
 #if defined(BOOST_HAS_LONG_LONG)
-    inline std::size_t hash_value(long long v)
+    inline std::size_t hash_value(boost::long_long_type v)
     {
         return hash_detail::hash_value_signed(v);
     }
 
-    inline std::size_t hash_value(unsigned long long v)
+    inline std::size_t hash_value(boost::ulong_long_type v)
     {
         return hash_detail::hash_value_unsigned(v);
     }
@@ -518,176 +518,12 @@ namespace boost
 }
 
 #endif // BOOST_FUNCTIONAL_HASH_HASH_HPP
-////////////////////////////////////////////////////////////////////////////////
+
+// Include this outside of the include guards in case the file is included
+// twice - once with BOOST_HASH_NO_EXTENSIONS defined, and then with it
+// undefined.
 
 #if !defined(BOOST_HASH_NO_EXTENSIONS) \
     && !defined(BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP)
-#define BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP
-
-namespace boost
-{
-
-#if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-    namespace hash_detail
-    {
-        template <bool IsArray>
-        struct call_hash_impl
-        {
-            template <class T>
-            struct inner
-            {
-                static std::size_t call(T const& v)
-                {
-                    using namespace boost;
-                    return hash_value(v);
-                }
-            };
-        };
-
-        template <>
-        struct call_hash_impl<true>
-        {
-            template <class Array>
-            struct inner
-            {
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-                static std::size_t call(Array const& v)
-#else
-                static std::size_t call(Array& v)
+#include <boost/functional/hash/extensions.hpp>
 #endif
-                {
-                    const int size = sizeof(v) / sizeof(*v);
-                    return boost::hash_range(v, v + size);
-                }
-            };
-        };
-
-        template <class T>
-        struct call_hash
-            : public call_hash_impl<boost::is_array<T>::value>
-                ::BOOST_NESTED_TEMPLATE inner<T>
-        {
-        };
-    }
-#endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-
-    template <class T> struct hash
-        : std::unary_function<T, std::size_t>
-    {
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-        std::size_t operator()(T const& val) const
-        {
-            return hash_value(val);
-        }
-#else
-        std::size_t operator()(T const& val) const
-        {
-            return hash_detail::call_hash<T>::call(val);
-        }
-#endif
-    };
-
-#if BOOST_WORKAROUND(__DMC__, <= 0x848)
-    template <class T, unsigned int n> struct hash<T[n]>
-        : std::unary_function<T[n], std::size_t>
-    {
-        std::size_t operator()(const T* val) const
-        {
-            return boost::hash_range(val, val+n);
-        }
-    };
-#endif
-
-#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-
-    // On compilers without partial specialization, boost::hash<T>
-    // has already been declared to deal with pointers, so just
-    // need to supply the non-pointer version.
-
-    namespace hash_detail
-    {
-        template <bool IsPointer>
-        struct hash_impl;
-
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
-        template <>
-        struct hash_impl<false>
-        {
-            template <class T>
-            struct inner
-                : std::unary_function<T, std::size_t>
-            {
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-                std::size_t operator()(T const& val) const
-                {
-                    return hash_value(val);
-                }
-#else
-                std::size_t operator()(T const& val) const
-                {
-                    return hash_detail::call_hash<T>::call(val);
-                }
-#endif
-            };
-        };
-
-#else // Visual C++ 6.5
-
-    // There's probably a more elegant way to Visual C++ 6.5 to work
-    // but I don't know what it is.
-
-        template <bool IsConst>
-        struct hash_impl_msvc
-        {
-            template <class T>
-            struct inner
-                : public std::unary_function<T, std::size_t>
-            {
-                std::size_t operator()(T const& val) const
-                {
-                    return hash_detail::call_hash<T const>::call(val);
-                }
-
-                std::size_t operator()(T& val) const
-                {
-                    return hash_detail::call_hash<T>::call(val);
-                }
-            };
-        };
-
-        template <>
-        struct hash_impl_msvc<true>
-        {
-            template <class T>
-            struct inner
-                : public std::unary_function<T, std::size_t>
-            {
-                std::size_t operator()(T& val) const
-                {
-                    return hash_detail::call_hash<T>::call(val);
-                }
-            };
-        };
-        
-        template <class T>
-        struct hash_impl_msvc2
-            : public hash_impl_msvc<boost::is_const<T>::value>
-                    ::BOOST_NESTED_TEMPLATE inner<T> {};
-        
-        template <>
-        struct hash_impl<false>
-        {
-            template <class T>
-            struct inner : public hash_impl_msvc2<T> {};
-        };
-
-#endif // Visual C++ 6.5
-    }
-#endif  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-}
-
-#endif
-
diff --git a/include/boost/functional/hash/list.hpp b/include/boost/functional/hash/list.hpp
index 219394b..201f6d0 100644
--- a/include/boost/functional/hash/list.hpp
+++ b/include/boost/functional/hash/list.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/hash/map.hpp b/include/boost/functional/hash/map.hpp
index 59e259f..6713d85 100644
--- a/include/boost/functional/hash/map.hpp
+++ b/include/boost/functional/hash/map.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/hash/pair.hpp b/include/boost/functional/hash/pair.hpp
index 68f2233..bf076f1 100644
--- a/include/boost/functional/hash/pair.hpp
+++ b/include/boost/functional/hash/pair.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/hash/set.hpp b/include/boost/functional/hash/set.hpp
index 6e3ef71..0533e76 100644
--- a/include/boost/functional/hash/set.hpp
+++ b/include/boost/functional/hash/set.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/hash/vector.hpp b/include/boost/functional/hash/vector.hpp
index eeadf4e..8bab799 100644
--- a/include/boost/functional/hash/vector.hpp
+++ b/include/boost/functional/hash/vector.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/hash_fwd.hpp b/include/boost/functional/hash_fwd.hpp
index 4d103f7..8b7d8e5 100644
--- a/include/boost/functional/hash_fwd.hpp
+++ b/include/boost/functional/hash_fwd.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2007 Daniel James.
+// Copyright 2005-2008 Daniel James.
 // Distributed under 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)
 

From 5d7f35c794268bd50994a1462346081acf011842 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 19 Jul 2008 09:02:10 +0000
Subject: [PATCH 036/111] Revert conversion from lightweight test to
 Boost.Test.

Merged revisions 47545 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r47545 | danieljames | 2008-07-18 13:31:18 +0100 (Fri, 18 Jul 2008) | 1 line

  Revert conversion from lightweight test to Boost.Test.
........


[SVN r47586]
---
 hash/test/container_fwd_test.cpp         |  2 +-
 hash/test/hash_built_in_array_test.cpp   | 16 ++---
 hash/test/hash_complex_test.cpp          | 10 ++--
 hash/test/hash_custom_test.cpp           | 16 ++---
 hash/test/hash_deprecated_headers.cpp    |  2 +-
 hash/test/hash_deque_test.cpp            |  6 +-
 hash/test/hash_float_test.cpp            |  4 +-
 hash/test/hash_float_test.hpp            | 76 ++++++++++++------------
 hash/test/hash_friend_test.cpp           | 16 ++---
 hash/test/hash_function_pointer_test.cpp | 32 +++++-----
 hash/test/hash_fwd_test_1.cpp            | 18 +++---
 hash/test/hash_fwd_test_2.cpp            |  6 +-
 hash/test/hash_global_namespace_test.cpp | 16 ++---
 hash/test/hash_list_test.cpp             |  6 +-
 hash/test/hash_long_double_test.cpp      |  4 +-
 hash/test/hash_map_test.cpp              |  6 +-
 hash/test/hash_map_test.hpp              |  8 +--
 hash/test/hash_no_ext_fail_test.cpp      |  2 +-
 hash/test/hash_no_ext_macro_1.cpp        |  8 +--
 hash/test/hash_no_ext_macro_2.cpp        |  8 +--
 hash/test/hash_number_test.cpp           | 62 +++++++++----------
 hash/test/hash_pointer_test.cpp          | 18 +++---
 hash/test/hash_range_test.cpp            | 28 ++++-----
 hash/test/hash_sequence_test.hpp         |  8 +--
 hash/test/hash_set_test.cpp              |  6 +-
 hash/test/hash_set_test.hpp              |  8 +--
 hash/test/hash_string_test.cpp           | 30 +++++-----
 hash/test/hash_value_array_test.cpp      | 14 ++---
 hash/test/hash_vector_test.cpp           |  6 +-
 hash/test/link_ext_test.cpp              |  4 +-
 hash/test/link_no_ext_test.cpp           |  9 ++-
 hash/test/link_test.cpp                  |  2 +-
 32 files changed, 228 insertions(+), 229 deletions(-)

diff --git a/hash/test/container_fwd_test.cpp b/hash/test/container_fwd_test.cpp
index 5c3c5e1..bae96c7 100644
--- a/hash/test/container_fwd_test.cpp
+++ b/hash/test/container_fwd_test.cpp
@@ -77,7 +77,7 @@ static void test(std::pair<X, Y> const&)
 #include <complex>
 #include <utility>
 
-int main(int, char**)
+int main()
 {
     std::deque<int> x1;
     std::list<std::string> x2;
diff --git a/hash/test/hash_built_in_array_test.cpp b/hash/test/hash_built_in_array_test.cpp
index 127d388..3d17f28 100644
--- a/hash/test/hash_built_in_array_test.cpp
+++ b/hash/test/hash_built_in_array_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -37,11 +37,11 @@ void array_int_test()
     int array3[2] = {2, 3};
     HASH_NAMESPACE::hash<int[2]> hasher3;
 
-    BOOST_CHECK(hasher1(array1)
+    BOOST_TEST(hasher1(array1)
             == HASH_NAMESPACE::hash_range(array1, array1 + length1));
-    BOOST_CHECK(hasher2(array2)
+    BOOST_TEST(hasher2(array2)
             == HASH_NAMESPACE::hash_range(array2, array2 + length2));
-    BOOST_CHECK(hasher3(array3)
+    BOOST_TEST(hasher3(array3)
             == HASH_NAMESPACE::hash_range(array3, array3 + length3));
 }
 
@@ -59,17 +59,17 @@ void two_dimensional_array_test()
         HASH_NAMESPACE::hash_combine(seed1, seed2);
     }
 
-    BOOST_CHECK(hasher(array) == seed1);
-    BOOST_CHECK(hasher(array) == HASH_NAMESPACE::hash_range(array, array + 3));
+    BOOST_TEST(hasher(array) == seed1);
+    BOOST_TEST(hasher(array) == HASH_NAMESPACE::hash_range(array, array + 3));
 }
 
 #endif // TEST_EXTENSIONS
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     array_int_test();
     two_dimensional_array_test();
 #endif
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
index 890dc0a..e941fdd 100644
--- a/hash/test/hash_complex_test.cpp
+++ b/hash/test/hash_complex_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -41,13 +41,13 @@ void generic_complex_tests(std::complex<T> v)
 {
     HASH_NAMESPACE::hash<std::complex<T> > complex_hasher;
 
-    BOOST_CHECK(complex_hasher(v) == complex_hasher(v));
+    BOOST_TEST(complex_hasher(v) == complex_hasher(v));
 
     HASH_NAMESPACE::hash<T> real_hasher;
     T real = v.real();
     T imag = v.imag();
 
-    BOOST_CHECK(real_hasher(real) == complex_hasher(std::complex<T>(real)));
+    BOOST_TEST(real_hasher(real) == complex_hasher(std::complex<T>(real)));
 
     if(imag != 0 && real_hasher(real) == complex_hasher(v)) {
         std::ostringstream os;
@@ -90,7 +90,7 @@ void complex_integral_tests(Integer*)
     }
 }
 
-int test_main(int, char**)
+int main()
 {
     complex_float_tests((float*) 0);
     complex_float_tests((double*) 0);
@@ -102,7 +102,7 @@ int test_main(int, char**)
     complex_integral_tests((unsigned int*) 0);
     complex_integral_tests((unsigned long*) 0);
 
-    return 0;
+    return boost::report_errors();
 }
 
 #endif
diff --git a/hash/test/hash_custom_test.cpp b/hash/test/hash_custom_test.cpp
index ccd59df..09e8ad8 100644
--- a/hash/test/hash_custom_test.cpp
+++ b/hash/test/hash_custom_test.cpp
@@ -48,7 +48,7 @@ namespace boost
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -59,13 +59,13 @@ namespace boost
 void custom_tests()
 {
     HASH_NAMESPACE::hash<test::custom> custom_hasher;
-    BOOST_CHECK(custom_hasher(10) == 100u);
+    BOOST_TEST(custom_hasher(10) == 100u);
     test::custom x(55);
-    BOOST_CHECK(custom_hasher(x) == 550u);
+    BOOST_TEST(custom_hasher(x) == 550u);
 
     {
         using namespace HASH_NAMESPACE;
-        BOOST_CHECK(custom_hasher(x) == hash_value(x));
+        BOOST_TEST(custom_hasher(x) == hash_value(x));
     }
 
     std::vector<test::custom> custom_vector;
@@ -83,17 +83,17 @@ void custom_tests()
     HASH_NAMESPACE::hash_combine(seed2, 250u);
     HASH_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_CHECK(seed ==
+    BOOST_TEST(seed ==
             HASH_NAMESPACE::hash_range(custom_vector.begin(), custom_vector.end()));
-    BOOST_CHECK(seed == seed2);
+    BOOST_TEST(seed == seed2);
 }
 
 #endif // TEST_EXTENSIONS
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     custom_tests();
 #endif
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_deprecated_headers.cpp b/hash/test/hash_deprecated_headers.cpp
index 5ebab8f..6a97e70 100644
--- a/hash/test/hash_deprecated_headers.cpp
+++ b/hash/test/hash_deprecated_headers.cpp
@@ -19,7 +19,7 @@
 
 #include <vector>
 
-int main(int, char**) {
+int main() {
     std::vector<int> v;
     boost::hash<std::vector<int> > x;
     x(v);
diff --git a/hash/test/hash_deque_test.cpp b/hash/test/hash_deque_test.cpp
index 5348a03..78841f8 100644
--- a/hash/test/hash_deque_test.cpp
+++ b/hash/test/hash_deque_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -25,11 +25,11 @@ using std::deque;
 
 #endif // TEST_EXTENSIONS
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     deque_tests::deque_hash_integer_tests();
 #endif
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_float_test.cpp b/hash/test/hash_float_test.cpp
index 7c5d59c..c23365d 100644
--- a/hash/test/hash_float_test.cpp
+++ b/hash/test/hash_float_test.cpp
@@ -5,7 +5,7 @@
 
 #include "hash_float_test.hpp"
 
-int test_main(int, char**)
+int main()
 {
     std::cerr<<"Compiler: "<<BOOST_COMPILER<<"\n";
     std::cerr<<"Platform: "<<BOOST_PLATFORM<<"\n";
@@ -14,5 +14,5 @@ int test_main(int, char**)
     float_tests("float", (float*) 0);
     float_tests("double", (double*) 0);
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
index eece27b..2ef3a86 100644
--- a/hash/test/hash_float_test.hpp
+++ b/hash/test/hash_float_test.hpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #include <cmath>
 #include <boost/limits.hpp>
@@ -43,11 +43,11 @@ void float_tests(char const* name, T* = 0)
     T zero = 0;
     T minus_zero = (T) -1 * zero;
 
-    BOOST_CHECK(zero == minus_zero);
-    BOOST_CHECK(x1(zero) == x1(minus_zero));
+    BOOST_TEST(zero == minus_zero);
+    BOOST_TEST(x1(zero) == x1(minus_zero));
 
-    BOOST_CHECK(x1(zero) == HASH_NAMESPACE::hash_value(zero));
-    BOOST_CHECK(x1(minus_zero) == HASH_NAMESPACE::hash_value(minus_zero));
+    BOOST_TEST(x1(zero) == HASH_NAMESPACE::hash_value(zero));
+    BOOST_TEST(x1(minus_zero) == HASH_NAMESPACE::hash_value(minus_zero));
 
     using namespace std;
 
@@ -65,23 +65,23 @@ void float_tests(char const* name, T* = 0)
         T minus_infinity2 = (T) -1. / zero;
         T minus_infinity3 = (T) 1. / minus_zero;
 
-        BOOST_CHECK(x1(infinity) == HASH_NAMESPACE::hash_value(infinity));
-        BOOST_CHECK(x1(minus_infinity)
+        BOOST_TEST(x1(infinity) == HASH_NAMESPACE::hash_value(infinity));
+        BOOST_TEST(x1(minus_infinity)
                 == HASH_NAMESPACE::hash_value(minus_infinity));
 
         if(infinity == infinity2)
-            BOOST_CHECK(x1(infinity) == x1(infinity2));
+            BOOST_TEST(x1(infinity) == x1(infinity2));
         if(infinity == infinity3)
-            BOOST_CHECK(x1(infinity) == x1(infinity3));
+            BOOST_TEST(x1(infinity) == x1(infinity3));
         if(infinity == infinity4)
-            BOOST_CHECK(x1(infinity) == x1(infinity4));
+            BOOST_TEST(x1(infinity) == x1(infinity4));
 
         if(minus_infinity == minus_infinity2)
-            BOOST_CHECK(x1(minus_infinity) == x1(minus_infinity2));
+            BOOST_TEST(x1(minus_infinity) == x1(minus_infinity2));
         if(minus_infinity == minus_infinity3)
-            BOOST_CHECK(x1(minus_infinity) == x1(minus_infinity3));
+            BOOST_TEST(x1(minus_infinity) == x1(minus_infinity3));
 
-        BOOST_CHECK(infinity != minus_infinity);
+        BOOST_TEST(infinity != minus_infinity);
 
         if(x1(infinity) == x1(minus_infinity)) {
             std::cerr<<"x1(infinity) == x1(-infinity) == "<<x1(infinity)<<"\n";
@@ -113,22 +113,22 @@ void float_tests(char const* name, T* = 0)
     T quarter_max = max / 4;
     T three_quarter_max = max - quarter_max;
 
-    BOOST_CHECK(x1(max) == HASH_NAMESPACE::hash_value(max));
-    BOOST_CHECK(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
-    BOOST_CHECK(x1(quarter_max) == HASH_NAMESPACE::hash_value(quarter_max));
-    BOOST_CHECK(x1(three_quarter_max) == HASH_NAMESPACE::hash_value(three_quarter_max));
+    BOOST_TEST(x1(max) == HASH_NAMESPACE::hash_value(max));
+    BOOST_TEST(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
+    BOOST_TEST(x1(quarter_max) == HASH_NAMESPACE::hash_value(quarter_max));
+    BOOST_TEST(x1(three_quarter_max) == HASH_NAMESPACE::hash_value(three_quarter_max));
 
     // The '!=' tests could legitimately fail, but with my hash it indicates a bug.
-    BOOST_CHECK(x1(max) == x1(max));
-    BOOST_CHECK(x1(max) != x1(quarter_max));
-    BOOST_CHECK(x1(max) != x1(half_max));
-    BOOST_CHECK(x1(max) != x1(three_quarter_max));
-    BOOST_CHECK(x1(quarter_max) == x1(quarter_max));
-    BOOST_CHECK(x1(quarter_max) != x1(half_max));
-    BOOST_CHECK(x1(quarter_max) != x1(three_quarter_max));
-    BOOST_CHECK(x1(half_max) == x1(half_max));
-    BOOST_CHECK(x1(half_max) != x1(three_quarter_max));
-    BOOST_CHECK(x1(three_quarter_max) == x1(three_quarter_max));
+    BOOST_TEST(x1(max) == x1(max));
+    BOOST_TEST(x1(max) != x1(quarter_max));
+    BOOST_TEST(x1(max) != x1(half_max));
+    BOOST_TEST(x1(max) != x1(three_quarter_max));
+    BOOST_TEST(x1(quarter_max) == x1(quarter_max));
+    BOOST_TEST(x1(quarter_max) != x1(half_max));
+    BOOST_TEST(x1(quarter_max) != x1(three_quarter_max));
+    BOOST_TEST(x1(half_max) == x1(half_max));
+    BOOST_TEST(x1(half_max) != x1(three_quarter_max));
+    BOOST_TEST(x1(three_quarter_max) == x1(three_quarter_max));
 
 // Intel with gcc stdlib sometimes segfaults on calls to asin and acos.
 #if !((defined(__INTEL_COMPILER) || defined(__ICL) || \
@@ -137,35 +137,35 @@ void float_tests(char const* name, T* = 0)
     T v1 = asin((T) 1);
     T v2 = acos((T) 0);
     if(v1 == v2)
-        BOOST_CHECK(x1(v1) == x1(v2));
-    BOOST_CHECK(x1(v1) == HASH_NAMESPACE::hash_value(v1));
-    BOOST_CHECK(x1(v2) == HASH_NAMESPACE::hash_value(v2));
+        BOOST_TEST(x1(v1) == x1(v2));
+    BOOST_TEST(x1(v1) == HASH_NAMESPACE::hash_value(v1));
+    BOOST_TEST(x1(v2) == HASH_NAMESPACE::hash_value(v2));
 #endif
 
-    BOOST_CHECK(x1(boost::hash_detail::limits<T>::epsilon()) ==
+    BOOST_TEST(x1(boost::hash_detail::limits<T>::epsilon()) ==
             HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::epsilon()));
 
-    BOOST_CHECK(boost::hash_detail::limits<T>::epsilon() != (T) 0);
+    BOOST_TEST(boost::hash_detail::limits<T>::epsilon() != (T) 0);
     if(x1(boost::hash_detail::limits<T>::epsilon()) == x1((T) 0))
         std::cerr<<"x1(epsilon) == x1(0) == "<<x1((T) 0)<<"\n";
 
-    BOOST_CHECK(-boost::hash_detail::limits<T>::epsilon() != (T) 0);
+    BOOST_TEST(-boost::hash_detail::limits<T>::epsilon() != (T) 0);
     if(x1(-boost::hash_detail::limits<T>::epsilon()) == x1((T) 0))
         std::cerr<<"x1(-epsilon) == x1(0) == "<<x1((T) 0)<<"\n";
 
-    BOOST_CHECK((T) 1 + boost::hash_detail::limits<T>::epsilon() != (T) 1);
+    BOOST_TEST((T) 1 + boost::hash_detail::limits<T>::epsilon() != (T) 1);
     if(x1((T) 1 + boost::hash_detail::limits<T>::epsilon()) == x1((T) 1))
         std::cerr<<"x1(1 + epsilon) == x1(1) == "<<x1((T) 1)<<"\n";
 
-    BOOST_CHECK((T) 1 - boost::hash_detail::limits<T>::epsilon() != (T) 1);
+    BOOST_TEST((T) 1 - boost::hash_detail::limits<T>::epsilon() != (T) 1);
     if(x1((T) 1 - boost::hash_detail::limits<T>::epsilon()) == x1((T) 1))
         std::cerr<<"x1(1 - epsilon) == x1(1) == "<<x1((T) 1)<<"\n";
 
-    BOOST_CHECK((T) -1 + boost::hash_detail::limits<T>::epsilon() != (T) -1);
+    BOOST_TEST((T) -1 + boost::hash_detail::limits<T>::epsilon() != (T) -1);
     if(x1((T) -1 + boost::hash_detail::limits<T>::epsilon()) == x1((T) -1))
         std::cerr<<"x1(-1 + epsilon) == x1(-1) == "<<x1((T) -1)<<"\n";
 
-    BOOST_CHECK((T) -1 - boost::hash_detail::limits<T>::epsilon() != (T) -1);
+    BOOST_TEST((T) -1 - boost::hash_detail::limits<T>::epsilon() != (T) -1);
     if(x1((T) -1 - boost::hash_detail::limits<T>::epsilon()) == x1((T) -1))
         std::cerr<<"x1(-1 - epsilon) == x1(-1) == "<<x1((T) -1)<<"\n";
 
@@ -197,7 +197,7 @@ void float_tests(char const* name, T* = 0)
         if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(1.0)) {
             std::cerr<<"x1(quiet_NaN) == x1(1.0) == "<<x1(1.0)<<"\n";
         }
-        BOOST_CHECK(x1(boost::hash_detail::limits<T>::quiet_NaN()) ==
+        BOOST_TEST(x1(boost::hash_detail::limits<T>::quiet_NaN()) ==
             HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::quiet_NaN()));
     }
 #endif
diff --git a/hash/test/hash_friend_test.cpp b/hash/test/hash_friend_test.cpp
index 4253f03..8f005e6 100644
--- a/hash/test/hash_friend_test.cpp
+++ b/hash/test/hash_friend_test.cpp
@@ -50,7 +50,7 @@ namespace boost
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -61,13 +61,13 @@ namespace boost
 void custom_tests()
 {
     HASH_NAMESPACE::hash<test::custom<int> > custom_hasher;
-    BOOST_CHECK(custom_hasher(10) == 100u);
+    BOOST_TEST(custom_hasher(10) == 100u);
     test::custom<int> x(55);
-    BOOST_CHECK(custom_hasher(x) == 550u);
+    BOOST_TEST(custom_hasher(x) == 550u);
 
     {
         using namespace HASH_NAMESPACE;
-        BOOST_CHECK(custom_hasher(x) == hash_value(x));
+        BOOST_TEST(custom_hasher(x) == hash_value(x));
     }
 
     std::vector<test::custom<int> > custom_vector;
@@ -85,17 +85,17 @@ void custom_tests()
     HASH_NAMESPACE::hash_combine(seed2, 250u);
     HASH_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_CHECK(seed ==
+    BOOST_TEST(seed ==
             HASH_NAMESPACE::hash_range(custom_vector.begin(), custom_vector.end()));
-    BOOST_CHECK(seed == seed2);
+    BOOST_TEST(seed == seed2);
 }
 
 #endif // TEST_EXTENSIONS
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     custom_tests();
 #endif
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp
index f3b8111..c171535 100644
--- a/hash/test/hash_function_pointer_test.cpp
+++ b/hash/test/hash_function_pointer_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #include <boost/limits.hpp>
 #include <boost/mpl/assert.hpp>
@@ -32,31 +32,31 @@ void function_pointer_tests()
     HASH_NAMESPACE::hash<void(*)()> hasher_void;
     HASH_NAMESPACE::hash<int(*)(int)> hasher_int;
 
-    BOOST_CHECK(&void_func1 != &void_func2);
-    BOOST_CHECK(&int_func1 != &int_func2);
+    BOOST_TEST(&void_func1 != &void_func2);
+    BOOST_TEST(&int_func1 != &int_func2);
 
-    BOOST_CHECK(hasher_void(0) == hasher_void(0));
-    BOOST_CHECK(hasher_void(&void_func1) == hasher_void(&void_func1));
-    BOOST_CHECK(hasher_void(&void_func1) != hasher_void(&void_func2));
-    BOOST_CHECK(hasher_void(&void_func1) != hasher_void(0));
-    BOOST_CHECK(hasher_int(0) == hasher_int(0));
-    BOOST_CHECK(hasher_int(&int_func1) == hasher_int(&int_func1));
-    BOOST_CHECK(hasher_int(&int_func1) != hasher_int(&int_func2));
-    BOOST_CHECK(hasher_int(&int_func1) != hasher_int(0));
+    BOOST_TEST(hasher_void(0) == hasher_void(0));
+    BOOST_TEST(hasher_void(&void_func1) == hasher_void(&void_func1));
+    BOOST_TEST(hasher_void(&void_func1) != hasher_void(&void_func2));
+    BOOST_TEST(hasher_void(&void_func1) != hasher_void(0));
+    BOOST_TEST(hasher_int(0) == hasher_int(0));
+    BOOST_TEST(hasher_int(&int_func1) == hasher_int(&int_func1));
+    BOOST_TEST(hasher_int(&int_func1) != hasher_int(&int_func2));
+    BOOST_TEST(hasher_int(&int_func1) != hasher_int(0));
 #if defined(TEST_EXTENSIONS)
-    BOOST_CHECK(hasher_void(&void_func1)
+    BOOST_TEST(hasher_void(&void_func1)
             == HASH_NAMESPACE::hash_value(&void_func1));
-    BOOST_CHECK(hasher_int(&int_func1)
+    BOOST_TEST(hasher_int(&int_func1)
             == HASH_NAMESPACE::hash_value(&int_func1));
 
     // This isn't specified in Peter's proposal:
-    BOOST_CHECK(hasher_void(0) == 0);
+    BOOST_TEST(hasher_void(0) == 0);
 #endif
 }
 
-int test_main(int, char**)
+int main()
 {
     function_pointer_tests();
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_fwd_test_1.cpp b/hash/test/hash_fwd_test_1.cpp
index b73c9ce..f9dfadb 100644
--- a/hash/test/hash_fwd_test_1.cpp
+++ b/hash/test/hash_fwd_test_1.cpp
@@ -7,7 +7,7 @@
 
 #include "./hash_fwd_test.hpp"
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #if defined(TEST_EXTENSIONS) && !defined(TEST_STD_INCLUDES)
 
@@ -24,8 +24,8 @@ void fwd_test1()
     HASH_NAMESPACE::hash<test::test_type1<int> > hasher_test_int;
     HASH_NAMESPACE::hash<test::test_type1<std::string> > hasher_test_string;
 
-    BOOST_CHECK(hasher_int(5) == hasher_test_int(x));
-    BOOST_CHECK(hasher_string("Test") == hasher_test_string(y));
+    BOOST_TEST(hasher_int(5) == hasher_test_int(x));
+    BOOST_TEST(hasher_string("Test") == hasher_test_string(y));
 }
 
 void fwd_test2()
@@ -44,8 +44,8 @@ void fwd_test2()
     HASH_NAMESPACE::hash<test::test_type2<int> > hasher_test_int;
     HASH_NAMESPACE::hash<test::test_type2<std::string> > hasher_test_string;
 
-    BOOST_CHECK(seed1 == hasher_test_int(x));
-    BOOST_CHECK(seed2 == hasher_test_string(y));
+    BOOST_TEST(seed1 == hasher_test_int(x));
+    BOOST_TEST(seed2 == hasher_test_string(y));
 }
 
 void fwd_test3()
@@ -75,19 +75,19 @@ void fwd_test3()
     HASH_NAMESPACE::hash<test::test_type3<int> > hasher_test_int;
     HASH_NAMESPACE::hash<test::test_type3<std::string> > hasher_test_string;
 
-    BOOST_CHECK(seed1 == hasher_test_int(x));
-    BOOST_CHECK(seed2 == hasher_test_string(y));
+    BOOST_TEST(seed1 == hasher_test_int(x));
+    BOOST_TEST(seed2 == hasher_test_string(y));
 }
 
 #endif
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     fwd_test1();
     fwd_test2();
     fwd_test3();
 #endif
-    return 0;
+    return boost::report_errors();
 }
 
diff --git a/hash/test/hash_fwd_test_2.cpp b/hash/test/hash_fwd_test_2.cpp
index e5dcbae..24ccc95 100644
--- a/hash/test/hash_fwd_test_2.cpp
+++ b/hash/test/hash_fwd_test_2.cpp
@@ -8,7 +8,7 @@
 
 #include "./hash_fwd_test.hpp"
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 template <class T> void unused(T const&) {}
 
@@ -31,9 +31,9 @@ void fwd_test()
 }
 
 
-int test_main(int, char**)
+int main()
 {
     fwd_test();
-    return 0;
+    return boost::report_errors();
 }
 
diff --git a/hash/test/hash_global_namespace_test.cpp b/hash/test/hash_global_namespace_test.cpp
index 588e95a..eafd22b 100644
--- a/hash/test/hash_global_namespace_test.cpp
+++ b/hash/test/hash_global_namespace_test.cpp
@@ -48,7 +48,7 @@ namespace boost
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -59,13 +59,13 @@ namespace boost
 void custom_tests()
 {
     HASH_NAMESPACE::hash<custom> custom_hasher;
-    BOOST_CHECK(custom_hasher(10) == 100u);
+    BOOST_TEST(custom_hasher(10) == 100u);
     custom x(55);
-    BOOST_CHECK(custom_hasher(x) == 550u);
+    BOOST_TEST(custom_hasher(x) == 550u);
 
     {
         using namespace HASH_NAMESPACE;
-        BOOST_CHECK(custom_hasher(x) == hash_value(x));
+        BOOST_TEST(custom_hasher(x) == hash_value(x));
     }
 
     std::vector<custom> custom_vector;
@@ -83,19 +83,19 @@ void custom_tests()
     HASH_NAMESPACE::hash_combine(seed2, 250u);
     HASH_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_CHECK(seed ==
+    BOOST_TEST(seed ==
             HASH_NAMESPACE::hash_range(custom_vector.begin(), custom_vector.end()));
-    BOOST_CHECK(seed == seed2);
+    BOOST_TEST(seed == seed2);
 }
 
 #endif // TEST_EXTENSIONS
 
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     custom_tests();
 #endif
-    return 0;
+    return boost::report_errors();
 }
 
diff --git a/hash/test/hash_list_test.cpp b/hash/test/hash_list_test.cpp
index ca99c67..0fd2bc5 100644
--- a/hash/test/hash_list_test.cpp
+++ b/hash/test/hash_list_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -25,11 +25,11 @@ using std::list;
 
 #endif // TEST_EXTENSIONS
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     list_tests::list_hash_integer_tests();
 #endif
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_long_double_test.cpp b/hash/test/hash_long_double_test.cpp
index 03c22c4..d4cbfce 100644
--- a/hash/test/hash_long_double_test.cpp
+++ b/hash/test/hash_long_double_test.cpp
@@ -5,7 +5,7 @@
 
 #include "hash_float_test.hpp"
 
-int test_main(int, char**)
+int main()
 {
     std::cerr<<"Compiler: "<<BOOST_COMPILER<<"\n";
     std::cerr<<"Platform: "<<BOOST_PLATFORM<<"\n";
@@ -13,5 +13,5 @@ int test_main(int, char**)
 
     float_tests("long double", (long double*) 0);
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_map_test.cpp b/hash/test/hash_map_test.cpp
index 1df1543..2ee6bc1 100644
--- a/hash/test/hash_map_test.cpp
+++ b/hash/test/hash_map_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #include <map>
 
@@ -29,12 +29,12 @@ using std::multimap;
 
 #endif // TEST_EXTENSTIONS
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     map_tests::map_hash_integer_tests();
     multimap_tests::multimap_hash_integer_tests();
 #endif
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp
index 8b7846d..bb03279 100644
--- a/hash/test/hash_map_test.hpp
+++ b/hash/test/hash_map_test.hpp
@@ -38,17 +38,17 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         HASH_NAMESPACE::hash<T> hasher;
 
         for(int i2 = 0; i2 < number_of_containers; ++i2) {
-            BOOST_CHECK(hasher(containers[i2]) == hasher(containers[i2]));
+            BOOST_TEST(hasher(containers[i2]) == hasher(containers[i2]));
 
-            BOOST_CHECK(hasher(containers[i2]) ==
+            BOOST_TEST(hasher(containers[i2]) ==
                     HASH_NAMESPACE::hash_value(containers[i2]));
 
-            BOOST_CHECK(hasher(containers[i2])
+            BOOST_TEST(hasher(containers[i2])
                     == HASH_NAMESPACE::hash_range(
                         containers[i2].begin(), containers[i2].end()));
 
             for(int j2 = i2 + 1; j2 < number_of_containers; ++j2) {
-                BOOST_CHECK(
+                BOOST_TEST(
                         (containers[i2] == containers[j2]) ==
                         (hasher(containers[i2]) == hasher(containers[j2]))
                         );
diff --git a/hash/test/hash_no_ext_fail_test.cpp b/hash/test/hash_no_ext_fail_test.cpp
index c5ddc14..3959738 100644
--- a/hash/test/hash_no_ext_fail_test.cpp
+++ b/hash/test/hash_no_ext_fail_test.cpp
@@ -12,7 +12,7 @@
 #include <boost/functional/hash.hpp>
 #include <boost/functional/hash.hpp>
 
-int test_main(int, char**)
+int main()
 {
     HASH_NAMESPACE::hash< int[10] > hasher;
     return 0;
diff --git a/hash/test/hash_no_ext_macro_1.cpp b/hash/test/hash_no_ext_macro_1.cpp
index 20a74e6..db2e580 100644
--- a/hash/test/hash_no_ext_macro_1.cpp
+++ b/hash/test/hash_no_ext_macro_1.cpp
@@ -7,11 +7,11 @@
 #include <boost/functional/hash.hpp>
 #define BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <deque>
 #include <cassert>
 
-int test_main(int, char**)
+int main()
 {
     std::deque<int> x;
 
@@ -19,7 +19,7 @@ int test_main(int, char**)
     x.push_back(2);
 
     HASH_NAMESPACE::hash<std::deque<int> > hasher;
-    BOOST_CHECK(hasher(x) == HASH_NAMESPACE::hash_value(x));
+    BOOST_TEST(hasher(x) == HASH_NAMESPACE::hash_value(x));
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_no_ext_macro_2.cpp b/hash/test/hash_no_ext_macro_2.cpp
index 8c80667..dbeb68d 100644
--- a/hash/test/hash_no_ext_macro_2.cpp
+++ b/hash/test/hash_no_ext_macro_2.cpp
@@ -8,10 +8,10 @@
 #include <boost/functional/hash.hpp>
 #undef BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <map>
 
-int test_main(int, char**)
+int main()
 {
     std::map<int, int> x;
 
@@ -19,7 +19,7 @@ int test_main(int, char**)
     x.insert(std::map<int, int>::value_type(14, -75));
 
     HASH_NAMESPACE::hash<std::map<int, int> > hasher;
-    BOOST_CHECK(hasher(x) == HASH_NAMESPACE::hash_value(x));
+    BOOST_TEST(hasher(x) == HASH_NAMESPACE::hash_value(x));
     
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index e21674f..ef97e99 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -12,7 +12,7 @@
 #endif
 
 #include <iostream>
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/limits.hpp>
@@ -39,27 +39,27 @@ void numeric_test(T*)
     HASH_NAMESPACE::hash<T> x2;
 
     T v1 = (T) -5;
-    BOOST_CHECK(x1(v1) == x2(v1));
-    BOOST_CHECK(x1(T(-5)) == x2(T(-5)));
-    BOOST_CHECK(x1(T(0)) == x2(T(0)));
-    BOOST_CHECK(x1(T(10)) == x2(T(10)));
-    BOOST_CHECK(x1(T(25)) == x2(T(25)));
-    BOOST_CHECK(x1(T(5) - T(5)) == x2(T(0)));
-    BOOST_CHECK(x1(T(6) + T(4)) == x2(T(10)));
+    BOOST_TEST(x1(v1) == x2(v1));
+    BOOST_TEST(x1(T(-5)) == x2(T(-5)));
+    BOOST_TEST(x1(T(0)) == x2(T(0)));
+    BOOST_TEST(x1(T(10)) == x2(T(10)));
+    BOOST_TEST(x1(T(25)) == x2(T(25)));
+    BOOST_TEST(x1(T(5) - T(5)) == x2(T(0)));
+    BOOST_TEST(x1(T(6) + T(4)) == x2(T(10)));
 
 #if defined(TEST_EXTENSIONS)
-    BOOST_CHECK(x1(T(-5)) == HASH_NAMESPACE::hash_value(T(-5)));
-    BOOST_CHECK(x1(T(0)) == HASH_NAMESPACE::hash_value(T(0)));
-    BOOST_CHECK(x1(T(10)) == HASH_NAMESPACE::hash_value(T(10)));
-    BOOST_CHECK(x1(T(25)) == HASH_NAMESPACE::hash_value(T(25)));
+    BOOST_TEST(x1(T(-5)) == HASH_NAMESPACE::hash_value(T(-5)));
+    BOOST_TEST(x1(T(0)) == HASH_NAMESPACE::hash_value(T(0)));
+    BOOST_TEST(x1(T(10)) == HASH_NAMESPACE::hash_value(T(10)));
+    BOOST_TEST(x1(T(25)) == HASH_NAMESPACE::hash_value(T(25)));
 
     if (limits::is_integer)
     {
         if(limits::is_signed || limits::digits <= boost::hash_detail::limits<std::size_t>::digits)
-            BOOST_CHECK(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
-        BOOST_CHECK(HASH_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
-        BOOST_CHECK(HASH_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
-        BOOST_CHECK(HASH_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
+            BOOST_TEST(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
+        BOOST_TEST(HASH_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
+        BOOST_TEST(HASH_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
+        BOOST_TEST(HASH_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
     }
 #endif
 }
@@ -77,18 +77,18 @@ void limits_test(T*)
         T min_value = (limits::min)();
         T max_value = (limits::max)();
 
-        BOOST_CHECK(x1(min_value) == x2((limits::min)()));
-        BOOST_CHECK(x1(max_value) == x2((limits::max)()));
+        BOOST_TEST(x1(min_value) == x2((limits::min)()));
+        BOOST_TEST(x1(max_value) == x2((limits::max)()));
 
 #if defined(TEST_EXTENSIONS)
-        BOOST_CHECK(x1(min_value) == HASH_NAMESPACE::hash_value(min_value));
-        BOOST_CHECK(x1(max_value) == HASH_NAMESPACE::hash_value(max_value));
+        BOOST_TEST(x1(min_value) == HASH_NAMESPACE::hash_value(min_value));
+        BOOST_TEST(x1(max_value) == HASH_NAMESPACE::hash_value(max_value));
 
         if (limits::is_integer)
         {
-            BOOST_CHECK(HASH_NAMESPACE::hash_value(min_value)
+            BOOST_TEST(HASH_NAMESPACE::hash_value(min_value)
                     == std::size_t(min_value));
-            BOOST_CHECK(HASH_NAMESPACE::hash_value(max_value)
+            BOOST_TEST(HASH_NAMESPACE::hash_value(max_value)
                     == std::size_t(max_value));
         }
 #endif
@@ -106,11 +106,11 @@ void poor_quality_tests(T*)
     // A hash function can legally fail these tests, but it'll not be a good
     // sign.
     if(T(1) != T(-1))
-        BOOST_CHECK(x1(T(1)) !=  x2(T(-1)));
+        BOOST_TEST(x1(T(1)) !=  x2(T(-1)));
     if(T(1) != T(2))
-        BOOST_CHECK(x1(T(1)) !=  x2(T(2)));
+        BOOST_TEST(x1(T(1)) !=  x2(T(2)));
     if((limits::max)() != (limits::max)() - 1)
-        BOOST_CHECK(x1((limits::max)()) != x2((limits::max)() - 1));
+        BOOST_TEST(x1((limits::max)()) != x2((limits::max)() - 1));
 }
 
 void bool_test()
@@ -118,10 +118,10 @@ void bool_test()
     HASH_NAMESPACE::hash<bool> x1;
     HASH_NAMESPACE::hash<bool> x2;
     
-    BOOST_CHECK(x1(true) == x2(true));
-    BOOST_CHECK(x1(false) == x2(false));
-    BOOST_CHECK(x1(true) != x2(false));
-    BOOST_CHECK(x1(false) != x2(true));
+    BOOST_TEST(x1(true) == x2(true));
+    BOOST_TEST(x1(false) == x2(false));
+    BOOST_TEST(x1(true) != x2(false));
+    BOOST_TEST(x1(false) != x2(true));
 }
 
 #define NUMERIC_TEST(type, name) \
@@ -134,7 +134,7 @@ void bool_test()
     numeric_test((type*) 0); \
     poor_quality_tests((type*) 0);
 
-int test_main(int, char**)
+int main()
 {
     NUMERIC_TEST(char, char)
     NUMERIC_TEST(signed char, schar)
@@ -159,7 +159,7 @@ int test_main(int, char**)
 
     bool_test();
 
-    return 0;
+    return boost::report_errors();
 }
 
 #if defined(BOOST_MSVC)
diff --git a/hash/test/hash_pointer_test.cpp b/hash/test/hash_pointer_test.cpp
index ca893a6..673f67a 100644
--- a/hash/test/hash_pointer_test.cpp
+++ b/hash/test/hash_pointer_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #include <boost/limits.hpp>
 #include <boost/mpl/assert.hpp>
@@ -30,20 +30,20 @@ void pointer_tests()
     int int1;
     int int2;
 
-    BOOST_CHECK(x1(0) == x2(0));
-    BOOST_CHECK(x1(&int1) == x2(&int1));
-    BOOST_CHECK(x1(&int2) == x2(&int2));
+    BOOST_TEST(x1(0) == x2(0));
+    BOOST_TEST(x1(&int1) == x2(&int1));
+    BOOST_TEST(x1(&int2) == x2(&int2));
 #if defined(TEST_EXTENSIONS)
-    BOOST_CHECK(x1(&int1) == HASH_NAMESPACE::hash_value(&int1));
-    BOOST_CHECK(x1(&int2) == HASH_NAMESPACE::hash_value(&int2));
+    BOOST_TEST(x1(&int1) == HASH_NAMESPACE::hash_value(&int1));
+    BOOST_TEST(x1(&int2) == HASH_NAMESPACE::hash_value(&int2));
 
     // This isn't specified in Peter's proposal:
-    BOOST_CHECK(x1(0) == 0);
+    BOOST_TEST(x1(0) == 0);
 #endif
 }
 
-int test_main(int, char**)
+int main()
 {
     pointer_tests();
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index 94af3e6..aac819b 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -41,45 +41,45 @@ void hash_range_tests()
     std::vector<int> x;
 
     std::size_t x_seed = 0;
-    BOOST_CHECK(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_TEST(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
-    BOOST_CHECK(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
+    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
         == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_CHECK(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
+    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
         != HASH_NAMESPACE::hash_range(values1.begin(), values1.end()));
 
     x.push_back(10);
     HASH_NAMESPACE::hash_combine(x_seed, 10);
-    BOOST_CHECK(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_TEST(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
-    BOOST_CHECK(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
+    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
         != HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_CHECK(HASH_NAMESPACE::hash_range(values2.begin(), values2.end())
+    BOOST_TEST(HASH_NAMESPACE::hash_range(values2.begin(), values2.end())
         == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
     x.push_back(20);
     HASH_NAMESPACE::hash_combine(x_seed, 20);
-    BOOST_CHECK(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_TEST(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
-    BOOST_CHECK(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
+    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
         != HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_CHECK(HASH_NAMESPACE::hash_range(values2.begin(), values2.end())
+    BOOST_TEST(HASH_NAMESPACE::hash_range(values2.begin(), values2.end())
         != HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_CHECK(HASH_NAMESPACE::hash_range(values3.begin(), values3.end())
+    BOOST_TEST(HASH_NAMESPACE::hash_range(values3.begin(), values3.end())
         == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
     std::size_t seed = HASH_NAMESPACE::hash_range(values3.begin(), values3.end());
     HASH_NAMESPACE::hash_range(seed, values4.begin(), values4.end());
     HASH_NAMESPACE::hash_range(seed, x.begin(), x.end());
-    BOOST_CHECK(seed == HASH_NAMESPACE::hash_range(values5.begin(), values5.end()));
+    BOOST_TEST(seed == HASH_NAMESPACE::hash_range(values5.begin(), values5.end()));
 }
 
 #endif
 
-int test_main(int, char**)
+int main()
 {
     hash_range_tests();
 
-    return 0;
+    return boost::report_errors();
 }
 
diff --git a/hash/test/hash_sequence_test.hpp b/hash/test/hash_sequence_test.hpp
index e2920ba..ad5b5df 100644
--- a/hash/test/hash_sequence_test.hpp
+++ b/hash/test/hash_sequence_test.hpp
@@ -41,17 +41,17 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         HASH_NAMESPACE::hash<T> hasher;
 
         for(int i2 = 0; i2 < number_of_containers; ++i2) {
-            BOOST_CHECK(hasher(containers[i2]) == hasher(containers[i2]));
+            BOOST_TEST(hasher(containers[i2]) == hasher(containers[i2]));
 
-            BOOST_CHECK(hasher(containers[i2]) ==
+            BOOST_TEST(hasher(containers[i2]) ==
                     HASH_NAMESPACE::hash_value(containers[i2]));
 
-            BOOST_CHECK(hasher(containers[i2])
+            BOOST_TEST(hasher(containers[i2])
                     == HASH_NAMESPACE::hash_range(
                         containers[i2].begin(), containers[i2].end()));
 
             for(int j2 = i2 + 1; j2 < number_of_containers; ++j2) {
-                BOOST_CHECK(
+                BOOST_TEST(
                         (containers[i2] == containers[j2]) ==
                         (hasher(containers[i2]) == hasher(containers[j2]))
                         );
diff --git a/hash/test/hash_set_test.cpp b/hash/test/hash_set_test.cpp
index 40f5dc3..538c4fd 100644
--- a/hash/test/hash_set_test.cpp
+++ b/hash/test/hash_set_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -29,12 +29,12 @@ using std::multiset;
 
 #endif
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     set_tests::set_hash_integer_tests();
     multiset_tests::multiset_hash_integer_tests();
 #endif
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_set_test.hpp b/hash/test/hash_set_test.hpp
index 18aa654..2184d47 100644
--- a/hash/test/hash_set_test.hpp
+++ b/hash/test/hash_set_test.hpp
@@ -44,17 +44,17 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         HASH_NAMESPACE::hash<T> hasher;
 
         for(int i2 = 0; i2 < number_of_containers; ++i2) {
-            BOOST_CHECK(hasher(containers[i2]) == hasher(containers[i2]));
+            BOOST_TEST(hasher(containers[i2]) == hasher(containers[i2]));
 
-            BOOST_CHECK(hasher(containers[i2]) ==
+            BOOST_TEST(hasher(containers[i2]) ==
                     HASH_NAMESPACE::hash_value(containers[i2]));
 
-            BOOST_CHECK(hasher(containers[i2])
+            BOOST_TEST(hasher(containers[i2])
                     == HASH_NAMESPACE::hash_range(
                         containers[i2].begin(), containers[i2].end()));
 
             for(int j2 = i2 + 1; j2 < number_of_containers; ++j2) {
-                BOOST_CHECK(
+                BOOST_TEST(
                         (containers[i2] == containers[j2]) ==
                         (hasher(containers[i2]) == hasher(containers[j2]))
                         );
diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp
index 34654ee..b58ec18 100644
--- a/hash/test/hash_string_test.cpp
+++ b/hash/test/hash_string_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #include <boost/limits.hpp>
 #include <boost/mpl/assert.hpp>
@@ -27,18 +27,18 @@ void string_tests()
     HASH_NAMESPACE::hash<std::string> x1;
     HASH_NAMESPACE::hash<std::string> x2;
 
-    BOOST_CHECK(x1("Hello") == x2(std::string("Hel") + "lo"));
-    BOOST_CHECK(x1("") == x2(std::string()));
+    BOOST_TEST(x1("Hello") == x2(std::string("Hel") + "lo"));
+    BOOST_TEST(x1("") == x2(std::string()));
 
 #if defined(TEST_EXTENSIONS)
     std::string value1;
     std::string value2("Hello");
 
-    BOOST_CHECK(x1(value1) == HASH_NAMESPACE::hash_value(value1));
-    BOOST_CHECK(x1(value2) == HASH_NAMESPACE::hash_value(value2));
-    BOOST_CHECK(HASH_NAMESPACE::hash_value(value1) ==
+    BOOST_TEST(x1(value1) == HASH_NAMESPACE::hash_value(value1));
+    BOOST_TEST(x1(value2) == HASH_NAMESPACE::hash_value(value2));
+    BOOST_TEST(HASH_NAMESPACE::hash_value(value1) ==
             HASH_NAMESPACE::hash_range(value1.begin(), value1.end()));
-    BOOST_CHECK(HASH_NAMESPACE::hash_value(value2) ==
+    BOOST_TEST(HASH_NAMESPACE::hash_value(value2) ==
             HASH_NAMESPACE::hash_range(value2.begin(), value2.end()));
 #endif
 }
@@ -51,28 +51,28 @@ void wstring_tests()
     HASH_NAMESPACE::hash<std::wstring> x1;
     HASH_NAMESPACE::hash<std::wstring> x2;
 
-    BOOST_CHECK(x1(L"Hello") == x2(std::wstring(L"Hel") + L"lo"));
-    BOOST_CHECK(x1(L"") == x2(std::wstring()));
+    BOOST_TEST(x1(L"Hello") == x2(std::wstring(L"Hel") + L"lo"));
+    BOOST_TEST(x1(L"") == x2(std::wstring()));
 
 #if defined(TEST_EXTENSIONS)
     std::wstring value1;
     std::wstring value2(L"Hello");
 
-    BOOST_CHECK(x1(value1) == HASH_NAMESPACE::hash_value(value1));
-    BOOST_CHECK(x1(value2) == HASH_NAMESPACE::hash_value(value2));
-    BOOST_CHECK(HASH_NAMESPACE::hash_value(value1) ==
+    BOOST_TEST(x1(value1) == HASH_NAMESPACE::hash_value(value1));
+    BOOST_TEST(x1(value2) == HASH_NAMESPACE::hash_value(value2));
+    BOOST_TEST(HASH_NAMESPACE::hash_value(value1) ==
             HASH_NAMESPACE::hash_range(value1.begin(), value1.end()));
-    BOOST_CHECK(HASH_NAMESPACE::hash_value(value2) ==
+    BOOST_TEST(HASH_NAMESPACE::hash_value(value2) ==
             HASH_NAMESPACE::hash_range(value2.begin(), value2.end()));
 #endif
 }
 #endif
 
-int test_main(int, char**)
+int main()
 {
     string_tests();
 #if !defined(BOOST_NO_STD_WSTRING)
     wstring_tests();
 #endif
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/hash_value_array_test.cpp b/hash/test/hash_value_array_test.cpp
index 240f0f0..c39e9f1 100644
--- a/hash/test/hash_value_array_test.cpp
+++ b/hash/test/hash_value_array_test.cpp
@@ -16,7 +16,7 @@
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -37,9 +37,9 @@ void array_int_test()
     int array3[2] = {2, 3};
     HASH_NAMESPACE::hash<int[2]> hasher3;
 
-    BOOST_CHECK(hasher1(array1) == HASH_NAMESPACE::hash_value(array1));
-    BOOST_CHECK(hasher2(array2) == HASH_NAMESPACE::hash_value(array2));
-    BOOST_CHECK(hasher3(array3) == HASH_NAMESPACE::hash_value(array3));
+    BOOST_TEST(hasher1(array1) == HASH_NAMESPACE::hash_value(array1));
+    BOOST_TEST(hasher2(array2) == HASH_NAMESPACE::hash_value(array2));
+    BOOST_TEST(hasher3(array3) == HASH_NAMESPACE::hash_value(array3));
 }
 
 void two_dimensional_array_test()
@@ -47,18 +47,18 @@ void two_dimensional_array_test()
     int array[3][2] = {{-5, 6}, {7, -3}, {26, 1}};
     HASH_NAMESPACE::hash<int[3][2]> hasher;
 
-    BOOST_CHECK(hasher(array) == HASH_NAMESPACE::hash_value(array));
+    BOOST_TEST(hasher(array) == HASH_NAMESPACE::hash_value(array));
 }
 
 #endif
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     array_int_test();
     two_dimensional_array_test();
 #endif
 
-    return 0;
+    return boost::report_errors();
 }
 
diff --git a/hash/test/hash_vector_test.cpp b/hash/test/hash_vector_test.cpp
index d5c25e2..5d8ff50 100644
--- a/hash/test/hash_vector_test.cpp
+++ b/hash/test/hash_vector_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
@@ -25,11 +25,11 @@ using std::vector;
 
 #endif // TEST_EXTENSIONS
 
-int test_main(int, char**)
+int main()
 {
 #ifdef TEST_EXTENSIONS
     vector_tests::vector_hash_integer_tests();
 #endif
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp
index d65c3bb..936cab6 100644
--- a/hash/test/link_ext_test.cpp
+++ b/hash/test/link_ext_test.cpp
@@ -5,13 +5,13 @@
 
 #define HASH_NAMESPACE boost
 #include <boost/functional/hash.hpp>
-#include <boost/test/minimal.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <vector>
 
 int f(std::size_t hash1, int* x1) {
     // Check that HASH_NAMESPACE::hash<int*> works in both files.
     HASH_NAMESPACE::hash<int*> ptr_hasher;
-    BOOST_CHECK(hash1 == ptr_hasher(x1));
+    BOOST_TEST(hash1 == ptr_hasher(x1));
 
     // Check that std::vector<std::size_t> is avaiable in this file.
     std::vector<std::size_t> x;
diff --git a/hash/test/link_no_ext_test.cpp b/hash/test/link_no_ext_test.cpp
index 102d8fd..22b03fa 100644
--- a/hash/test/link_no_ext_test.cpp
+++ b/hash/test/link_no_ext_test.cpp
@@ -6,14 +6,13 @@
 #define HASH_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
-#include <boost/assert.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 extern int f(std::size_t, int*);
 
-int test_main(int, char**) {
+int main() {
     HASH_NAMESPACE::hash<int*> ptr_hasher;
     int x = 55;
-
-    BOOST_ASSERT(!f(ptr_hasher(&x), &x));
-    return 0;
+    BOOST_TEST(!f(ptr_hasher(&x), &x));
+    return boost::report_errors();
 }
diff --git a/hash/test/link_test.cpp b/hash/test/link_test.cpp
index 756d6c8..2819e05 100644
--- a/hash/test/link_test.cpp
+++ b/hash/test/link_test.cpp
@@ -6,4 +6,4 @@
 #include <boost/functional/hash.hpp>
 
 extern int f();
-int main(int, char**) { return f(); }
+int main() { return f(); }

From 0551dec300edca1b61ad0e0e1c27cad47e0d7aa2 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 11 Sep 2008 18:28:51 +0000
Subject: [PATCH 037/111] Always use c99 float function overloads when using
 Dinkumware with Visual C++, as it doesn't always have the C++ overloads.
 Fixes #2264.

Merged revisions 48529,48674 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r48529 | danieljames | 2008-09-02 11:31:26 +0100 (Tue, 02 Sep 2008) | 1 line

  Always use c99 float function overloads on Dinkumware, as it doesn't always
  have the C++ overloads. Refs #2264.
........
  r48674 | danieljames | 2008-09-08 22:06:16 +0100 (Mon, 08 Sep 2008) | 7 lines

  Reinstate the old choice of float functions on Dinkumware for all compilers
  other than Visual C++.

  It turns out that Borland uses Dinkumware but doesn't have the C99 float
  overloads, so it only seems realistic to assume their existence on Visual C++.
  Refs #2264.
........


[SVN r48739]
---
 include/boost/functional/detail/float_functions.hpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/boost/functional/detail/float_functions.hpp b/include/boost/functional/detail/float_functions.hpp
index 72386ad..a35f292 100644
--- a/include/boost/functional/detail/float_functions.hpp
+++ b/include/boost/functional/detail/float_functions.hpp
@@ -61,9 +61,13 @@
 
 // Dinkumware.
 #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-// Overloaded float functions were probably introduced in an earlier version
-// than this.
-#  if defined(_CPPLIB_VER) && (_CPPLIB_VER >= 402)
+// Some versions of Visual C++ don't seem to have the C++ overloads but they
+// all seem to have the c99 float overloads
+#  if defined(BOOST_MSVC)
+#    define BOOST_HASH_USE_C99_FLOAT_FUNCS
+// On other platforms the C++ overloads seem to have been introduced sometime
+// before 402.
+#  elif defined(_CPPLIB_VER) && (_CPPLIB_VER >= 402)
 #    define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
 #  else
 #    define BOOST_HASH_USE_C99_FLOAT_FUNCS

From 028afd6c4fd7f02b957ab509c7cec6e55e966672 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Mon, 13 Oct 2008 09:00:03 +0000
Subject: [PATCH 038/111] Merge fixes from Trunk.

Fixes #2392.

Change includes of <cmath> to <boost/config/no_tr1/config.hpp>.

Previously if Boost.TR1 was in the include path then including <cmath> pulls in all the new TR1 math functions, which in turn also requires linking to an external library. With auto-linking support this requires that library to have been built and be present in the library search path, even if the actual library under use is header only.

[SVN r49314]
---
 include/boost/functional/detail/float_functions.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/functional/detail/float_functions.hpp b/include/boost/functional/detail/float_functions.hpp
index a35f292..5cef36e 100644
--- a/include/boost/functional/detail/float_functions.hpp
+++ b/include/boost/functional/detail/float_functions.hpp
@@ -6,7 +6,7 @@
 #if !defined(BOOST_FUNCTIONAL_DETAIL_FLOAT_FUNCTIONS_HPP)
 #define BOOST_FUNCTIONAL_DETAIL_FLOAT_FUNCTIONS_HPP
 
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once

From a186aa979aa37189e15ca8a74382e200de80dcb5 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 5 Nov 2008 13:30:43 +0000
Subject: [PATCH 039/111] Merge error messages for old hash headers.

Merged revisions 49339-49341,49541 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r49339 | danieljames | 2008-10-15 11:25:07 +0100 (Wed, 15 Oct 2008) | 1 line

  Note about change in boost 1.37.
........
  r49340 | danieljames | 2008-10-15 11:26:55 +0100 (Wed, 15 Oct 2008) | 4 lines

  Changed the warnings in the deprecated headers from 1.34.0 to errors. These
  will be removed in a future version of Boost (probably 1.39.0).
........
  r49341 | danieljames | 2008-10-15 11:34:15 +0100 (Wed, 15 Oct 2008) | 2 lines

  Add note about changes to deprecated headers. Refs #2412.
........
  r49541 | danieljames | 2008-11-02 22:32:00 +0000 (Sun, 02 Nov 2008) | 3 lines

  Slightly more accurated comment - now that the headers cause errors, they've
  moved past the deprecation stage (I think).
........


[SVN r49597]
---
 hash/doc/changes.qbk                     | 11 +++++++++++
 hash/test/Jamfile.v2                     |  2 +-
 include/boost/functional/hash/deque.hpp  | 22 +---------------------
 include/boost/functional/hash/list.hpp   | 22 +---------------------
 include/boost/functional/hash/map.hpp    | 22 +---------------------
 include/boost/functional/hash/pair.hpp   | 22 +---------------------
 include/boost/functional/hash/set.hpp    | 22 +---------------------
 include/boost/functional/hash/vector.hpp | 22 +---------------------
 8 files changed, 18 insertions(+), 127 deletions(-)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 0288804..4d0515a 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -59,4 +59,15 @@
 * Using the boost typedefs for `long long` and `unsigned long long`.
 * Move the extensions into their own header.
 
+[h2 Boost 1.37.0]
+
+* [@http://svn.boost.org/trac/boost/ticket/2264 Ticket 2264]:
+  In Visual C++, always use C99 float functions for `long double` and `float` as
+  the C++ overloads aren't always availables.
+
+[h2 Boost 1.38.0]
+
+* Changed the warnings in the deprecated headers from 1.34.0 to errors. These
+  will be removed in a future version of Boost.
+
 [endsect]
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index da8a0f9..2f771b3 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -40,7 +40,7 @@ test-suite functional/hash
         [ compile-fail hash_no_ext_fail_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
         [ run hash_no_ext_macro_2.cpp ]
-        [ run hash_deprecated_headers.cpp : : : <test-info>always_show_run_output ]
+        [ compile-fail hash_deprecated_headers.cpp ]
     ;
 
 build-project ../examples ;
diff --git a/include/boost/functional/hash/deque.hpp b/include/boost/functional/hash/deque.hpp
index 06d23c2..0dd8b99 100644
--- a/include/boost/functional/hash/deque.hpp
+++ b/include/boost/functional/hash/deque.hpp
@@ -3,25 +3,5 @@
 // Distributed under 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)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_DEQUE_HPP)
-#define BOOST_FUNCTIONAL_HASH_DEQUE_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/deque.hpp is no longer supported, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif
diff --git a/include/boost/functional/hash/list.hpp b/include/boost/functional/hash/list.hpp
index 201f6d0..61e7b6d 100644
--- a/include/boost/functional/hash/list.hpp
+++ b/include/boost/functional/hash/list.hpp
@@ -3,25 +3,5 @@
 // Distributed under 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)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_LIST_HPP)
-#define BOOST_FUNCTIONAL_HASH_LIST_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/list.hpp is no longer supported, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif
diff --git a/include/boost/functional/hash/map.hpp b/include/boost/functional/hash/map.hpp
index 6713d85..2dcd58b 100644
--- a/include/boost/functional/hash/map.hpp
+++ b/include/boost/functional/hash/map.hpp
@@ -3,25 +3,5 @@
 // Distributed under 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)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_MAP_HPP)
-#define BOOST_FUNCTIONAL_HASH_MAP_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/map.hpp is no longer supported, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif
diff --git a/include/boost/functional/hash/pair.hpp b/include/boost/functional/hash/pair.hpp
index bf076f1..d771460 100644
--- a/include/boost/functional/hash/pair.hpp
+++ b/include/boost/functional/hash/pair.hpp
@@ -3,25 +3,5 @@
 // Distributed under 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)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_PAIR_HPP)
-#define BOOST_FUNCTIONAL_HASH_PAIR_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/pair.hpp is no longer supported, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif
diff --git a/include/boost/functional/hash/set.hpp b/include/boost/functional/hash/set.hpp
index 0533e76..e85f80d 100644
--- a/include/boost/functional/hash/set.hpp
+++ b/include/boost/functional/hash/set.hpp
@@ -3,25 +3,5 @@
 // Distributed under 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)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_SET_HPP)
-#define BOOST_FUNCTIONAL_HASH_SET_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/set.hpp is no longer supported, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif
diff --git a/include/boost/functional/hash/vector.hpp b/include/boost/functional/hash/vector.hpp
index 8bab799..7fe2be6 100644
--- a/include/boost/functional/hash/vector.hpp
+++ b/include/boost/functional/hash/vector.hpp
@@ -3,25 +3,5 @@
 // Distributed under 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)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_VECTOR_HPP)
-#define BOOST_FUNCTIONAL_HASH_VECTOR_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/vector.hpp is no longer supported, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

From 6a0f115b339abd881ddbf8862131138ef9cdaa24 Mon Sep 17 00:00:00 2001
From: Boris Gubenko <boris.gubenko@hp.com>
Date: Sun, 4 Jan 2009 05:17:02 +0000
Subject: [PATCH 040/111] merge tests and Jamfiles for 7 libraries

[SVN r50456]
---
 test/Jamfile.v2                             | 9 +++++++++
 function_test.cpp => test/function_test.cpp | 0
 2 files changed, 9 insertions(+)
 create mode 100644 test/Jamfile.v2
 rename function_test.cpp => test/function_test.cpp (100%)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
new file mode 100644
index 0000000..dbe379c
--- /dev/null
+++ b/test/Jamfile.v2
@@ -0,0 +1,9 @@
+#~ Copyright Rene Rivera 2008
+#~ Distributed under 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)
+
+import testing ;
+
+test-suite functional :
+    [ run function_test.cpp ]
+    ;
diff --git a/function_test.cpp b/test/function_test.cpp
similarity index 100%
rename from function_test.cpp
rename to test/function_test.cpp

From c2fc561d41466f1ac4c1dda3e233f52e86ae5279 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Fri, 9 Jan 2009 23:12:14 +0000
Subject: [PATCH 041/111] Rename parameter to avoid Visual C++ warning about
 clash with boost::array.

Merged revisions 50514 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r50514 | danieljames | 2009-01-08 13:37:33 +0000 (Thu, 08 Jan 2009) | 3 lines

  Rename parameter to avoid Visual C++ warning about clash with boost::array.

  Fixes #2643
........


[SVN r50528]
---
 include/boost/functional/hash/hash.hpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 9de4990..b789ad6 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -58,10 +58,10 @@ namespace boost
 
 #if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
     template< class T, unsigned N >
-    std::size_t hash_value(const T (&array)[N]);
+    std::size_t hash_value(const T (&x)[N]);
 
     template< class T, unsigned N >
-    std::size_t hash_value(T (&array)[N]);
+    std::size_t hash_value(T (&x)[N]);
 #endif
 
     std::size_t hash_value(float v);
@@ -281,15 +281,15 @@ namespace boost
 
 #if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
     template< class T, unsigned N >
-    inline std::size_t hash_value(const T (&array)[N])
+    inline std::size_t hash_value(const T (&x)[N])
     {
-        return hash_range(array, array + N);
+        return hash_range(x, x + N);
     }
 
     template< class T, unsigned N >
-    inline std::size_t hash_value(T (&array)[N])
+    inline std::size_t hash_value(T (&x)[N])
     {
-        return hash_range(array, array + N);
+        return hash_range(x, x + N);
     }
 #endif
 

From ecdbca2dacb7e8c8161776eb012e1a609bc1fb59 Mon Sep 17 00:00:00 2001
From: "Troy D. Straszheim" <troy@resophonic.com>
Date: Sat, 24 Jan 2009 18:57:20 +0000
Subject: [PATCH 042/111] merge of cmake build files from trunk per beman

[SVN r50756]
---
 CMakeLists.txt               | 22 ++++++++++++++++
 hash/doc/CMakeLists.txt      |  2 ++
 hash/examples/CMakeLists.txt |  9 +++++++
 hash/test/CMakeLists.txt     | 51 ++++++++++++++++++++++++++++++++++++
 module.cmake                 |  1 +
 test/CMakeLists.txt          |  1 +
 6 files changed, 86 insertions(+)
 create mode 100644 CMakeLists.txt
 create mode 100644 hash/doc/CMakeLists.txt
 create mode 100644 hash/examples/CMakeLists.txt
 create mode 100644 hash/test/CMakeLists.txt
 create mode 100644 module.cmake
 create mode 100644 test/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..bcd5130
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,22 @@
+#----------------------------------------------------------------------------
+# This file was automatically generated from the original CMakeLists.txt file
+# Add a variable to hold the headers for the library
+set (lib_headers
+    functional.hpp
+    functional
+)
+
+# Add a library target to the build system
+boost_library_project(
+  functional
+  #  SRCDIRS 
+  TESTDIRS  test hash/test hash/examples
+  HEADERS ${lib_headers}
+  DOCDIRS  hash/doc
+  #  DESCRIPTION 
+  MODULARIZED 
+  #  AUTHORS 
+  #  MAINTAINERS 
+)
+
+
diff --git a/hash/doc/CMakeLists.txt b/hash/doc/CMakeLists.txt
new file mode 100644
index 0000000..cd83029
--- /dev/null
+++ b/hash/doc/CMakeLists.txt
@@ -0,0 +1,2 @@
+message(STATUS "functional/hash docs need love")
+
diff --git a/hash/examples/CMakeLists.txt b/hash/examples/CMakeLists.txt
new file mode 100644
index 0000000..9a5efc8
--- /dev/null
+++ b/hash/examples/CMakeLists.txt
@@ -0,0 +1,9 @@
+#-------------------------------------------------------------------------
+#-- Needed include directories for the tests
+boost_additional_test_dependencies(config BOOST_DEPENDS test)
+#-------------------------------------------------------------------------
+boost_test_run(books)
+boost_test_run(point)
+boost_test_run(portable)
+
+
diff --git a/hash/test/CMakeLists.txt b/hash/test/CMakeLists.txt
new file mode 100644
index 0000000..a4e132b
--- /dev/null
+++ b/hash/test/CMakeLists.txt
@@ -0,0 +1,51 @@
+#project hash-tests
+#    : requirements
+#        <toolset>gcc:<define>_GLIBCXX_DEBUG
+#    ;
+if (GCC)
+  ADD_DEFINITIONS(-D_GLIBCXX_DEBUG)
+endif(GCC)
+
+#        [ run .cpp : : : <test-info>always_show_run_output ]
+
+
+
+#-------------------------------------------------------------------------
+#-- Needed include directories for the tests
+  boost_additional_test_dependencies(functional BOOST_DEPENDS test)
+#-------------------------------------------------------------------------
+
+SET(tests
+hash_float_test
+hash_fwd_test_1
+hash_fwd_test_2
+hash_number_test
+hash_pointer_test
+hash_function_pointer_test
+hash_string_test
+hash_range_test
+hash_custom_test
+hash_global_namespace_test
+hash_friend_test
+hash_built_in_array_test
+hash_value_array_test
+hash_vector_test
+hash_list_test
+hash_deque_test
+hash_set_test
+hash_map_test
+container_fwd_test
+hash_no_ext_macro_1
+hash_no_ext_macro_2
+)
+
+boost_test_run(link_test link_test.cpp link_test_2.cpp)
+boost_test_run(link_ext_test link_ext_test.cpp link_no_ext_test.cpp)
+
+foreach(test ${tests})
+  boost_test_run(${test})
+endforeach(test ${tests})
+
+boost_test_compile_fail(hash_no_ext_fail_test)
+
+# build-project ../examples ;
diff --git a/module.cmake b/module.cmake
new file mode 100644
index 0000000..f10d82e
--- /dev/null
+++ b/module.cmake
@@ -0,0 +1 @@
+boost_module(functional DEPENDS integer)
\ No newline at end of file
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 0000000..79691c3
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1 @@
+boost_test_run(function_test function_test.cpp)

From a82f5ca4662b6c81848898981e321d6ca776023e Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Mon, 23 Feb 2009 18:39:32 +0000
Subject: [PATCH 043/111] Merge PDF build changes from Trunk.

[SVN r51417]
---
 hash/doc/Jamfile.v2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hash/doc/Jamfile.v2 b/hash/doc/Jamfile.v2
index 731a228..709e49a 100644
--- a/hash/doc/Jamfile.v2
+++ b/hash/doc/Jamfile.v2
@@ -5,7 +5,7 @@
 
 xml hash : hash.qbk ;
 boostbook standalone : hash :
-    <xsl:param>admon.graphics.path=images/
+    <format>html:<xsl:param>admon.graphics.path=images/
     <xsl:param>navig.graphics.path=images/
     <xsl:param>html.stylesheet=boostbook.css
     <xsl:param>boost.root=../../../../..
@@ -15,6 +15,7 @@ boostbook standalone : hash :
     <xsl:param>generate.section.toc.level=2
     <xsl:param>toc.section.depth=1
     <xsl:param>toc.max.depth=1
+    <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/functional/hash/doc/html
 
     <dependency>css
     <dependency>images
@@ -26,3 +27,4 @@ install images : [ glob $(BOOST_ROOT)/doc/src/images/*.png ]
     : <location>html/images ;
 explicit css ;
 explicit images ;
+

From 60e877acc50e4bb2c22af1a62e2ef81a928b0572 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 11 Mar 2009 22:51:09 +0000
Subject: [PATCH 044/111] Merge hash and unordered changes.

Remove deprecated headers, move hash_fwd.hpp into hash subdirectory. And
several minor internal changes.
Mostly minor internal details.

Merged revisions 51262-51263,51407-51409,51504-51505,51644-51646,51667 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r51262 | danieljames | 2009-02-15 19:32:04 +0000 (Sun, 15 Feb 2009) | 1 line

  Use the new 'boost:' links for the hash, unordered and quickbook documentation.
........
  r51263 | danieljames | 2009-02-15 19:32:19 +0000 (Sun, 15 Feb 2009) | 2 lines

  Don't copy images for the standalone hash and unordered documentation, was only
  really required before the libraries were integrated into boost.
........
  r51407 | danieljames | 2009-02-22 23:49:51 +0000 (Sun, 22 Feb 2009) | 1 line

  Fix the hash dirname.
........
  r51408 | danieljames | 2009-02-22 23:50:04 +0000 (Sun, 22 Feb 2009) | 1 line

  Make copy_buckets and move_buckets member functions - so that calling them is a bit simpler.
........
  r51409 | danieljames | 2009-02-22 23:50:20 +0000 (Sun, 22 Feb 2009) | 1 line

  Move some of the data structure classes out of hash table data.
........
  r51504 | danieljames | 2009-03-01 14:15:09 +0000 (Sun, 01 Mar 2009) | 1 line

  Add missing return for operator=.
........
  r51505 | danieljames | 2009-03-01 14:15:39 +0000 (Sun, 01 Mar 2009) | 3 lines

  Make the sort stable.

  Doesn't really matter, but it might as well be.
........
  r51644 | danieljames | 2009-03-08 09:44:51 +0000 (Sun, 08 Mar 2009) | 1 line

  Detab.
........
  r51645 | danieljames | 2009-03-08 09:45:11 +0000 (Sun, 08 Mar 2009) | 4 lines

  Move hash_fwd into the hash subdirectory.

  I should have done this in the last release. But now all of the hash
  implementation is in the hash subdirectory.
........
  r51646 | danieljames | 2009-03-08 09:45:30 +0000 (Sun, 08 Mar 2009) | 3 lines

  Remove deprecated headers.

  Fixes #2412.
........
  r51667 | danieljames | 2009-03-09 20:56:23 +0000 (Mon, 09 Mar 2009) | 1 line

  Update copyright dates in hash and unordered.
........


[SVN r51729]
---
 hash/doc/Jamfile.v2                           | 17 ++------
 hash/doc/hash.qbk                             |  2 +-
 hash/doc/intro.qbk                            |  6 +--
 hash/doc/portability.qbk                      |  2 +-
 hash/doc/ref.xml                              |  2 +-
 hash/doc/tutorial.qbk                         |  8 ++--
 hash/examples/books.cpp                       |  2 +-
 hash/examples/books.hpp                       |  2 +-
 hash/examples/portable.cpp                    |  2 +-
 hash/test/Jamfile.v2                          |  1 -
 hash/test/compile_time.hpp                    |  2 +-
 hash/test/config.hpp                          |  2 +-
 hash/test/container_fwd_test.cpp              |  2 +-
 hash/test/hash_built_in_array_test.cpp        |  2 +-
 hash/test/hash_complex_test.cpp               |  2 +-
 hash/test/hash_custom_test.cpp                |  2 +-
 hash/test/hash_deprecated_headers.cpp         | 26 ------------
 hash/test/hash_deque_test.cpp                 |  2 +-
 hash/test/hash_float_test.cpp                 |  2 +-
 hash/test/hash_float_test.hpp                 |  2 +-
 hash/test/hash_friend_test.cpp                |  2 +-
 hash/test/hash_function_pointer_test.cpp      |  2 +-
 hash/test/hash_fwd_test.hpp                   |  2 +-
 hash/test/hash_fwd_test_1.cpp                 |  2 +-
 hash/test/hash_fwd_test_2.cpp                 |  2 +-
 hash/test/hash_global_namespace_test.cpp      |  2 +-
 hash/test/hash_list_test.cpp                  |  2 +-
 hash/test/hash_long_double_test.cpp           |  2 +-
 hash/test/hash_map_test.cpp                   |  2 +-
 hash/test/hash_map_test.hpp                   |  2 +-
 hash/test/hash_no_ext_fail_test.cpp           |  2 +-
 hash/test/hash_no_ext_macro_1.cpp             |  2 +-
 hash/test/hash_no_ext_macro_2.cpp             |  2 +-
 hash/test/hash_number_test.cpp                |  2 +-
 hash/test/hash_pointer_test.cpp               |  2 +-
 hash/test/hash_range_test.cpp                 |  2 +-
 hash/test/hash_sequence_test.hpp              |  2 +-
 hash/test/hash_set_test.cpp                   |  2 +-
 hash/test/hash_set_test.hpp                   |  2 +-
 hash/test/hash_string_test.cpp                |  2 +-
 hash/test/hash_value_array_test.cpp           |  2 +-
 hash/test/hash_vector_test.cpp                |  2 +-
 hash/test/link_ext_test.cpp                   |  2 +-
 hash/test/link_no_ext_test.cpp                |  2 +-
 hash/test/link_test.cpp                       |  2 +-
 hash/test/link_test_2.cpp                     |  2 +-
 include/boost/functional/hash.hpp             |  6 +--
 include/boost/functional/hash/deque.hpp       |  7 ----
 .../hash/detail/float_functions.hpp           |  2 +-
 .../functional/hash/detail/hash_float.hpp     |  6 +--
 include/boost/functional/hash/extensions.hpp  |  2 +-
 include/boost/functional/hash/hash.hpp        |  4 +-
 include/boost/functional/hash/hash_fwd.hpp    | 40 +++++++++++++++++++
 include/boost/functional/hash/list.hpp        |  7 ----
 include/boost/functional/hash/map.hpp         |  7 ----
 include/boost/functional/hash/pair.hpp        |  7 ----
 include/boost/functional/hash/set.hpp         |  7 ----
 include/boost/functional/hash/vector.hpp      |  7 ----
 include/boost/functional/hash_fwd.hpp         | 37 +----------------
 59 files changed, 99 insertions(+), 180 deletions(-)
 delete mode 100644 hash/test/hash_deprecated_headers.cpp
 delete mode 100644 include/boost/functional/hash/deque.hpp
 create mode 100644 include/boost/functional/hash/hash_fwd.hpp
 delete mode 100644 include/boost/functional/hash/list.hpp
 delete mode 100644 include/boost/functional/hash/map.hpp
 delete mode 100644 include/boost/functional/hash/pair.hpp
 delete mode 100644 include/boost/functional/hash/set.hpp
 delete mode 100644 include/boost/functional/hash/vector.hpp

diff --git a/hash/doc/Jamfile.v2 b/hash/doc/Jamfile.v2
index 709e49a..acdf5ec 100644
--- a/hash/doc/Jamfile.v2
+++ b/hash/doc/Jamfile.v2
@@ -5,26 +5,15 @@
 
 xml hash : hash.qbk ;
 boostbook standalone : hash :
-    <format>html:<xsl:param>admon.graphics.path=images/
-    <xsl:param>navig.graphics.path=images/
-    <xsl:param>html.stylesheet=boostbook.css
+    <xsl:param>html.stylesheet=../../../../../doc/html/boostbook.css
     <xsl:param>boost.root=../../../../..
     <xsl:param>boost.libraries=../../../../libraries.htm
+    <xsl:param>navig.graphics=1
+
     <xsl:param>chunk.first.sections=1
     <xsl:param>chunk.section.depth=2
     <xsl:param>generate.section.toc.level=2
     <xsl:param>toc.section.depth=1
     <xsl:param>toc.max.depth=1
     <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/functional/hash/doc/html
-
-    <dependency>css
-    <dependency>images
     ;
-
-install css : [ glob $(BOOST_ROOT)/doc/src/*.css ]
-    : <location>html ;
-install images : [ glob $(BOOST_ROOT)/doc/src/images/*.png ]
-    : <location>html/images ;
-explicit css ;
-explicit images ;
-
diff --git a/hash/doc/hash.qbk b/hash/doc/hash.qbk
index 39d6d97..b734fb4 100644
--- a/hash/doc/hash.qbk
+++ b/hash/doc/hash.qbk
@@ -6,7 +6,7 @@
         defined types]
     [category higher-order]
     [id hash]
-    [dirname hash]
+    [dirname functional/hash]
     [license
         Distributed under the Boost Software License, Version 1.0.
         (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/hash/doc/intro.qbk b/hash/doc/intro.qbk
index bba5de3..b027719 100644
--- a/hash/doc/intro.qbk
+++ b/hash/doc/intro.qbk
@@ -13,11 +13,11 @@
     TR1]]
 [def __unordered__ [link unordered Boost.Unordered]]
 [def __intrusive__ [link intrusive.unordered_set_unordered_multiset Boost.Intrusive]]
-[def __multi-index__ [@../../libs/multi_index/doc/index.html
+[def __multi-index__ [@boost:/libs/multi_index/doc/index.html
     Boost Multi-Index Containers Library]]
-[def __multi-index-short__ [@../../libs/multi_index/doc/index.html
+[def __multi-index-short__ [@boost:/libs/multi_index/doc/index.html
     Boost.MultiIndex]]
-[def __bimap__ [@../../libs/bimap/index.html Boost.Bimap]]
+[def __bimap__ [@boost:/libs/bimap/index.html Boost.Bimap]]
 [def __issues__
     [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1837.pdf
     Library Extension Technical Report Issues List]]
diff --git a/hash/doc/portability.qbk b/hash/doc/portability.qbk
index e9100ce..fabb298 100644
--- a/hash/doc/portability.qbk
+++ b/hash/doc/portability.qbk
@@ -88,7 +88,7 @@ boost namespace:
     }
 
 Full code for this example is at
-[@../../libs/functional/hash/examples/portable.cpp /libs/functional/hash/examples/portable.cpp].
+[@boost:/libs/functional/hash/examples/portable.cpp /libs/functional/hash/examples/portable.cpp].
 
 [h2 Other Issues]
 
diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index 6bb32ce..1fe97d3 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -1,6 +1,6 @@
 
 <!--
-Copyright Daniel James 2005-2008
+Copyright Daniel James 2005-2009
 Distributed under 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)
 -->
diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index eaf9a95..b2f79f5 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -3,7 +3,7 @@
  / Distributed under 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) ]
 
-[def __multi-index-short__ [@../../libs/multi_index/doc/index.html
+[def __multi-index-short__ [@boost:/libs/multi_index/doc/index.html
     Boost.MultiIndex]]
 
 [section:tutorial Tutorial]
@@ -110,9 +110,9 @@ And you can now use [classref boost::hash] with book:
     assert(books.find(dandelion) == books.end());
 
 The full example can be found in:
-[@../../libs/functional/hash/examples/books.cpp /libs/functional/hash/examples/books.hpp]
+[@boost:/libs/functional/hash/examples/books.cpp /libs/functional/hash/examples/books.hpp]
 and
-[@../../libs/functional/hash/examples/books.cpp /libs/functional/hash/examples/books.cpp].
+[@boost:/libs/functional/hash/examples/books.cpp /libs/functional/hash/examples/books.cpp].
 
 [tip
 When writing a hash function, first look at how the equality function works.
@@ -170,7 +170,7 @@ of point, it can be repeatedly called for any number of elements. It calls
 [funcref boost::hash_value hash_value] on the supplied element, and combines it with the seed.
 
 Full code for this example is at
-[@../../libs/functional/hash/examples/point.cpp /libs/functional/hash/examples/point.cpp].
+[@boost:/libs/functional/hash/examples/point.cpp /libs/functional/hash/examples/point.cpp].
 
 [note
 When using [funcref boost::hash_combine] the order of the
diff --git a/hash/examples/books.cpp b/hash/examples/books.cpp
index 2615564..d54b353 100644
--- a/hash/examples/books.cpp
+++ b/hash/examples/books.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/examples/books.hpp b/hash/examples/books.hpp
index c0cf414..ac87a9d 100644
--- a/hash/examples/books.hpp
+++ b/hash/examples/books.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/examples/portable.cpp b/hash/examples/portable.cpp
index 98026c1..88f2fc7 100644
--- a/hash/examples/portable.cpp
+++ b/hash/examples/portable.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 2f771b3..ff149a7 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -40,7 +40,6 @@ test-suite functional/hash
         [ compile-fail hash_no_ext_fail_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
         [ run hash_no_ext_macro_2.cpp ]
-        [ compile-fail hash_deprecated_headers.cpp ]
     ;
 
 build-project ../examples ;
diff --git a/hash/test/compile_time.hpp b/hash/test/compile_time.hpp
index 873df13..bd86038 100644
--- a/hash/test/compile_time.hpp
+++ b/hash/test/compile_time.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/config.hpp b/hash/test/config.hpp
index 9ef55b7..0f84cc7 100644
--- a/hash/test/config.hpp
+++ b/hash/test/config.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/container_fwd_test.cpp b/hash/test/container_fwd_test.cpp
index bae96c7..87f5b90 100644
--- a/hash/test/container_fwd_test.cpp
+++ b/hash/test/container_fwd_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_built_in_array_test.cpp b/hash/test/hash_built_in_array_test.cpp
index 3d17f28..9c91799 100644
--- a/hash/test/hash_built_in_array_test.cpp
+++ b/hash/test/hash_built_in_array_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
index e941fdd..dd519c9 100644
--- a/hash/test/hash_complex_test.cpp
+++ b/hash/test/hash_complex_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_custom_test.cpp b/hash/test/hash_custom_test.cpp
index 09e8ad8..9943d0c 100644
--- a/hash/test/hash_custom_test.cpp
+++ b/hash/test/hash_custom_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_deprecated_headers.cpp b/hash/test/hash_deprecated_headers.cpp
deleted file mode 100644
index 6a97e70..0000000
--- a/hash/test/hash_deprecated_headers.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// Copyright 2007-2008 Daniel James.
-// Distributed under 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)
-
-// All these headers are meant output a warning, but not cause the compilation
-// to fail.
-
-#include <boost/functional/hash/deque.hpp>
-#include <boost/functional/hash/list.hpp>
-#include <boost/functional/hash/map.hpp>
-#include <boost/functional/hash/pair.hpp>
-#include <boost/functional/hash/set.hpp>
-#include <boost/functional/hash/vector.hpp>
-
-// And a quick check that the hash library was included.
-// Strictly speaking I should do this once for each header
-// but that would just be wasting the testing resources.
-
-#include <vector>
-
-int main() {
-    std::vector<int> v;
-    boost::hash<std::vector<int> > x;
-    x(v);
-}
diff --git a/hash/test/hash_deque_test.cpp b/hash/test/hash_deque_test.cpp
index 78841f8..bfb2691 100644
--- a/hash/test/hash_deque_test.cpp
+++ b/hash/test/hash_deque_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_float_test.cpp b/hash/test/hash_float_test.cpp
index c23365d..2490f8d 100644
--- a/hash/test/hash_float_test.cpp
+++ b/hash/test/hash_float_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
index 2ef3a86..eef49b2 100644
--- a/hash/test/hash_float_test.hpp
+++ b/hash/test/hash_float_test.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_friend_test.cpp b/hash/test/hash_friend_test.cpp
index 8f005e6..cac4c7f 100644
--- a/hash/test/hash_friend_test.cpp
+++ b/hash/test/hash_friend_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2008 Daniel James.
+// Copyright 2006-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp
index c171535..7fa4c89 100644
--- a/hash/test/hash_function_pointer_test.cpp
+++ b/hash/test/hash_function_pointer_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_fwd_test.hpp b/hash/test/hash_fwd_test.hpp
index 4822510..2438abf 100644
--- a/hash/test/hash_fwd_test.hpp
+++ b/hash/test/hash_fwd_test.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2008 Daniel James.
+// Copyright 2006-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_fwd_test_1.cpp b/hash/test/hash_fwd_test_1.cpp
index f9dfadb..e9a1cd8 100644
--- a/hash/test/hash_fwd_test_1.cpp
+++ b/hash/test/hash_fwd_test_1.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2008 Daniel James.
+// Copyright 2006-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_fwd_test_2.cpp b/hash/test/hash_fwd_test_2.cpp
index 24ccc95..bfa701d 100644
--- a/hash/test/hash_fwd_test_2.cpp
+++ b/hash/test/hash_fwd_test_2.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2008 Daniel James.
+// Copyright 2006-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_global_namespace_test.cpp b/hash/test/hash_global_namespace_test.cpp
index eafd22b..a45278c 100644
--- a/hash/test/hash_global_namespace_test.cpp
+++ b/hash/test/hash_global_namespace_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2008 Daniel James.
+// Copyright 2006-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_list_test.cpp b/hash/test/hash_list_test.cpp
index 0fd2bc5..30560d3 100644
--- a/hash/test/hash_list_test.cpp
+++ b/hash/test/hash_list_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_long_double_test.cpp b/hash/test/hash_long_double_test.cpp
index d4cbfce..860a679 100644
--- a/hash/test/hash_long_double_test.cpp
+++ b/hash/test/hash_long_double_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_map_test.cpp b/hash/test/hash_map_test.cpp
index 2ee6bc1..2f813c3 100644
--- a/hash/test/hash_map_test.cpp
+++ b/hash/test/hash_map_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp
index bb03279..3b52a50 100644
--- a/hash/test/hash_map_test.hpp
+++ b/hash/test/hash_map_test.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_no_ext_fail_test.cpp b/hash/test/hash_no_ext_fail_test.cpp
index 3959738..ef7ae96 100644
--- a/hash/test/hash_no_ext_fail_test.cpp
+++ b/hash/test/hash_no_ext_fail_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2008 Daniel James.
+// Copyright 2006-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_no_ext_macro_1.cpp b/hash/test/hash_no_ext_macro_1.cpp
index db2e580..640c36a 100644
--- a/hash/test/hash_no_ext_macro_1.cpp
+++ b/hash/test/hash_no_ext_macro_1.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2008 Daniel James.
+// Copyright 2006-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_no_ext_macro_2.cpp b/hash/test/hash_no_ext_macro_2.cpp
index dbeb68d..2f53779 100644
--- a/hash/test/hash_no_ext_macro_2.cpp
+++ b/hash/test/hash_no_ext_macro_2.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2008 Daniel James.
+// Copyright 2006-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index ef97e99..1000258 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_pointer_test.cpp b/hash/test/hash_pointer_test.cpp
index 673f67a..5fcbc27 100644
--- a/hash/test/hash_pointer_test.cpp
+++ b/hash/test/hash_pointer_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index aac819b..66aad26 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_sequence_test.hpp b/hash/test/hash_sequence_test.hpp
index ad5b5df..4093bc4 100644
--- a/hash/test/hash_sequence_test.hpp
+++ b/hash/test/hash_sequence_test.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_set_test.cpp b/hash/test/hash_set_test.cpp
index 538c4fd..8b5463d 100644
--- a/hash/test/hash_set_test.cpp
+++ b/hash/test/hash_set_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_set_test.hpp b/hash/test/hash_set_test.hpp
index 2184d47..2a60781 100644
--- a/hash/test/hash_set_test.hpp
+++ b/hash/test/hash_set_test.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp
index b58ec18..85f5a0d 100644
--- a/hash/test/hash_string_test.cpp
+++ b/hash/test/hash_string_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_value_array_test.cpp b/hash/test/hash_value_array_test.cpp
index c39e9f1..75dfd4f 100644
--- a/hash/test/hash_value_array_test.cpp
+++ b/hash/test/hash_value_array_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/hash_vector_test.cpp b/hash/test/hash_vector_test.cpp
index 5d8ff50..de02fe8 100644
--- a/hash/test/hash_vector_test.cpp
+++ b/hash/test/hash_vector_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp
index 936cab6..ca4c8f3 100644
--- a/hash/test/link_ext_test.cpp
+++ b/hash/test/link_ext_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2006-2008 Daniel James.
+// Copyright 2006-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/link_no_ext_test.cpp b/hash/test/link_no_ext_test.cpp
index 22b03fa..7f46984 100644
--- a/hash/test/link_no_ext_test.cpp
+++ b/hash/test/link_no_ext_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/link_test.cpp b/hash/test/link_test.cpp
index 2819e05..37f9ee1 100644
--- a/hash/test/link_test.cpp
+++ b/hash/test/link_test.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/hash/test/link_test_2.cpp b/hash/test/link_test_2.cpp
index 8be1635..f32065c 100644
--- a/hash/test/link_test_2.cpp
+++ b/hash/test/link_test_2.cpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/hash.hpp b/include/boost/functional/hash.hpp
index 46b611b..44983f1 100644
--- a/include/boost/functional/hash.hpp
+++ b/include/boost/functional/hash.hpp
@@ -1,11 +1,7 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
 #include <boost/functional/hash/hash.hpp>
 
diff --git a/include/boost/functional/hash/deque.hpp b/include/boost/functional/hash/deque.hpp
deleted file mode 100644
index 0dd8b99..0000000
--- a/include/boost/functional/hash/deque.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// Copyright 2005-2008 Daniel James.
-// Distributed under 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)
-
-#error "boost/functional/hash/deque.hpp is no longer supported, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
diff --git a/include/boost/functional/hash/detail/float_functions.hpp b/include/boost/functional/hash/detail/float_functions.hpp
index 154bab7..074b64f 100644
--- a/include/boost/functional/hash/detail/float_functions.hpp
+++ b/include/boost/functional/hash/detail/float_functions.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/functional/hash/detail/hash_float.hpp
index ca449da..5d5ac34 100644
--- a/include/boost/functional/hash/detail/hash_float.hpp
+++ b/include/boost/functional/hash/detail/hash_float.hpp
@@ -1,12 +1,8 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
 #if !defined(BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_HEADER)
 #define BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_HEADER
 
diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp
index b9d868e..d173314 100644
--- a/include/boost/functional/hash/extensions.hpp
+++ b/include/boost/functional/hash/extensions.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index b789ad6..67284fc 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
@@ -10,7 +10,7 @@
 #if !defined(BOOST_FUNCTIONAL_HASH_HASH_HPP)
 #define BOOST_FUNCTIONAL_HASH_HASH_HPP
 
-#include <boost/functional/hash_fwd.hpp>
+#include <boost/functional/hash/hash_fwd.hpp>
 #include <functional>
 #include <boost/functional/hash/detail/hash_float.hpp>
 #include <boost/detail/container_fwd.hpp>
diff --git a/include/boost/functional/hash/hash_fwd.hpp b/include/boost/functional/hash/hash_fwd.hpp
new file mode 100644
index 0000000..1d51b07
--- /dev/null
+++ b/include/boost/functional/hash/hash_fwd.hpp
@@ -0,0 +1,40 @@
+
+// Copyright 2005-2009 Daniel James.
+// Distributed under 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)
+
+//  Based on Peter Dimov's proposal
+//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
+//  issue 6.18. 
+
+#if !defined(BOOST_FUNCTIONAL_HASH_FWD_HPP)
+#define BOOST_FUNCTIONAL_HASH_FWD_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/config.hpp>
+#include <cstddef>
+#include <boost/detail/workaround.hpp>
+
+namespace boost
+{
+    template <class T> struct hash;
+
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+    template <class T> void hash_combine(std::size_t& seed, T& v);
+#else
+    template <class T> void hash_combine(std::size_t& seed, T const& v);
+#endif
+
+    template <class It> std::size_t hash_range(It, It);
+    template <class It> void hash_range(std::size_t&, It, It);
+
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+    template <class T> inline std::size_t hash_range(T*, T*);
+    template <class T> inline void hash_range(std::size_t&, T*, T*);
+#endif
+}
+
+#endif
diff --git a/include/boost/functional/hash/list.hpp b/include/boost/functional/hash/list.hpp
deleted file mode 100644
index 61e7b6d..0000000
--- a/include/boost/functional/hash/list.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// Copyright 2005-2008 Daniel James.
-// Distributed under 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)
-
-#error "boost/functional/hash/list.hpp is no longer supported, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
diff --git a/include/boost/functional/hash/map.hpp b/include/boost/functional/hash/map.hpp
deleted file mode 100644
index 2dcd58b..0000000
--- a/include/boost/functional/hash/map.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// Copyright 2005-2008 Daniel James.
-// Distributed under 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)
-
-#error "boost/functional/hash/map.hpp is no longer supported, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
diff --git a/include/boost/functional/hash/pair.hpp b/include/boost/functional/hash/pair.hpp
deleted file mode 100644
index d771460..0000000
--- a/include/boost/functional/hash/pair.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// Copyright 2005-2008 Daniel James.
-// Distributed under 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)
-
-#error "boost/functional/hash/pair.hpp is no longer supported, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
diff --git a/include/boost/functional/hash/set.hpp b/include/boost/functional/hash/set.hpp
deleted file mode 100644
index e85f80d..0000000
--- a/include/boost/functional/hash/set.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// Copyright 2005-2008 Daniel James.
-// Distributed under 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)
-
-#error "boost/functional/hash/set.hpp is no longer supported, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
diff --git a/include/boost/functional/hash/vector.hpp b/include/boost/functional/hash/vector.hpp
deleted file mode 100644
index 7fe2be6..0000000
--- a/include/boost/functional/hash/vector.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// Copyright 2005-2008 Daniel James.
-// Distributed under 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)
-
-#error "boost/functional/hash/vector.hpp is no longer supported, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
diff --git a/include/boost/functional/hash_fwd.hpp b/include/boost/functional/hash_fwd.hpp
index 8b7d8e5..b640988 100644
--- a/include/boost/functional/hash_fwd.hpp
+++ b/include/boost/functional/hash_fwd.hpp
@@ -1,40 +1,7 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2009 Daniel James.
 // Distributed under 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)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
+#include <boost/functional/hash/hash_fwd.hpp>
 
-#if !defined(BOOST_FUNCTIONAL_HASH_FWD_HPP)
-#define BOOST_FUNCTIONAL_HASH_FWD_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#include <boost/config.hpp>
-#include <cstddef>
-#include <boost/detail/workaround.hpp>
-
-namespace boost
-{
-    template <class T> struct hash;
-
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-    template <class T> void hash_combine(std::size_t& seed, T& v);
-#else
-    template <class T> void hash_combine(std::size_t& seed, T const& v);
-#endif
-
-    template <class It> std::size_t hash_range(It, It);
-    template <class It> void hash_range(std::size_t&, It, It);
-
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
-    template <class T> inline std::size_t hash_range(T*, T*);
-    template <class T> inline void hash_range(std::size_t&, T*, T*);
-#endif
-}
-
-#endif

From 9af7267918a164bf5fbceffee052d3aa6dbd924b Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 22 Mar 2009 10:42:48 +0000
Subject: [PATCH 045/111] Merge misc. changes from trunk, mostly minor
 documentation fixes.

Merged revisions 48412,50921,51042,51369,51386-51387,51506-51507,51668,51802,51804,51881 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r48412 | danieljames | 2008-08-28 11:23:33 +0100 (Thu, 28 Aug 2008) | 1 line

  Fix a typo. Thanks to Jon Biggar.
........
  r50921 | danieljames | 2009-01-31 09:36:38 +0000 (Sat, 31 Jan 2009) | 1 line

  Remove executable flag from preprocess.cmd. It was a mistake to add it.
........
  r51042 | danieljames | 2009-02-06 00:04:44 +0000 (Fri, 06 Feb 2009) | 1 line

  Ignore some version control files in inspect.
........
  r51369 | danieljames | 2009-02-21 18:49:48 +0000 (Sat, 21 Feb 2009) | 1 line

  Minor markup fix in concept check documentation.
........
  r51386 | danieljames | 2009-02-22 11:53:28 +0000 (Sun, 22 Feb 2009) | 1 line

  Add index.html file for compose, as our server setup doesn't support index.htm files.
........
  r51387 | danieljames | 2009-02-22 11:53:48 +0000 (Sun, 22 Feb 2009) | 5 lines

  Add missing index.html file for MPI and GIL.

  All the top level libraries now have index.html files but
  several sub-libraries don't. I'm not sure it's worth adding them as many
  of them don't have appropriate subdirectories anyway.
........
  r51506 | danieljames | 2009-03-01 14:16:00 +0000 (Sun, 01 Mar 2009) | 1 line

  Update links to command line invocation.
........
  r51507 | danieljames | 2009-03-01 14:16:24 +0000 (Sun, 01 Mar 2009) | 1 line

  Use xpointer attributes in the boost build documentation.
........
  r51668 | danieljames | 2009-03-09 20:56:51 +0000 (Mon, 09 Mar 2009) | 1 line

  Redirect to the Trac wiki instead of the old one.
........
  r51802 | danieljames | 2009-03-16 20:21:05 +0000 (Mon, 16 Mar 2009) | 1 line

  Use paragraphs inside purpose tags.
........
  r51804 | danieljames | 2009-03-16 20:21:46 +0000 (Mon, 16 Mar 2009) | 1 line

  Give the variablelist a margin.
........
  r51881 | danieljames | 2009-03-21 15:35:35 +0000 (Sat, 21 Mar 2009) | 1 line

  Fix html.
........


[SVN r51897]
---
 hash/doc/ref.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index 1fe97d3..47a09d5 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -34,7 +34,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
           <classname>std::unary_function&lt;T, std::size_t&gt;</classname>
         </inherit>
 
-        <purpose>A <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf">TR1</ulink> compliant hash function object.</purpose>
+        <purpose><simpara>A <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf">TR1</ulink> compliant hash function object.</simpara></purpose>
 
         <method name="operator()" cv="const">
           <type>std::size_t</type>
@@ -419,10 +419,10 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
         <type>void</type>
         <parameter name="seed"><paramtype>size_t &amp;</paramtype></parameter>
         <parameter name="v"><paramtype>T const&amp;</paramtype></parameter>
-        <purpose>
+        <purpose><simpara>
             Called repeatedly to incrementally create a hash value from
             several variables.
-        </purpose>
+        </simpara></purpose>
         <effects><programlisting>seed ^= <functionname>hash_value</functionname>(v) + 0x9e3779b9 + (seed &lt;&lt; 6) + (seed &gt;&gt; 2);</programlisting></effects>
         <notes>
           <para><functionname>hash_value</functionname> is called without
@@ -460,10 +460,10 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
           <parameter name="last"><paramtype>It</paramtype></parameter>
         </signature>
 
-        <purpose>
+        <purpose><simpara>
             Calculate the combined hash value of the elements of an iterator
             range.
-        </purpose>
+        </simpara></purpose>
         <effects>
           <para>For the two argument overload:
 <programlisting>
@@ -511,9 +511,9 @@ for(; first != last; ++first)
         -->
 
       <overloaded-function name="hash_value">
-        <purpose>
+        <purpose><simpara>
             Implementation of the hash function.
-        </purpose>
+        </simpara></purpose>
 
         <signature>
           <type>std::size_t</type>

From 79b2313c682e2e6374623657365a95160d9764d1 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 22 Mar 2009 14:03:26 +0000
Subject: [PATCH 046/111] Fix a link.

This change wasn't completely merged.

Merged revisions 44383 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r44383 | grafik | 2008-04-13 23:47:01 +0100 (Sun, 13 Apr 2008) | 1 line

  Move functional tests into canonical test subdir structure.
........


[SVN r51900]
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index aea70a6..29ea0d2 100644
--- a/index.html
+++ b/index.html
@@ -161,7 +161,7 @@ std::for_each(c.begin(), c.end(),
 
   <h3>Compiler Compatibility</h3>
 
-  <p>The header and <a href="function_test.cpp">test program</a> have been
+  <p>The header and <a href="test/function_test.cpp">test program</a> have been
   compiled with the following compilers:</p>
 
   <table border="1" cellpadding="5" summary="">

From 8a4506cca3741a56abf17921888f776897c78d23 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 11 Apr 2009 08:49:33 +0000
Subject: [PATCH 047/111] Merge quickbook and hash changelogs. Tweak gcc
 detection in container_fwd.hpp

Merged revisions 52084,52245-52246,52304,52320,52323 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r52084 | danieljames | 2009-03-31 20:43:58 +0100 (Tue, 31 Mar 2009) | 1 line

  Changelog for unordered and hash.
........
  r52245 | danieljames | 2009-04-08 06:51:31 +0100 (Wed, 08 Apr 2009) | 5 lines

  Detect gcc stdlib for gcc 4.0.1.

  For some reason the normal macros aren't defined for the standard
  library that comes with gcc 4.0.1 (although maybe just on BSDs?). So try
  to detect the library for that compiler.
........
  r52246 | danieljames | 2009-04-08 11:56:22 +0100 (Wed, 08 Apr 2009) | 7 lines

  Include <utility> for some versions of gcc's library.

  Sometimes gcc's <cstddef> doesn't define the C++ macros, so check for it
  and include <utility> in that case. Also remove a workaround from
  container_fwd.hpp

  Fixes #2924.
........
  r52304 | danieljames | 2009-04-10 20:25:32 +0100 (Fri, 10 Apr 2009) | 4 lines

  Don't use debug containers on darwin.

  I'm getting errors from the darwin 4.2 debug containers which appear to
  a problem with its implementation.
........
  r52320 | danieljames | 2009-04-11 08:53:59 +0100 (Sat, 11 Apr 2009) | 1 line

  Don't need to include utility now that select_stdlib has been fixed.
........
  r52323 | danieljames | 2009-04-11 09:26:20 +0100 (Sat, 11 Apr 2009) | 1 line

  Also don't need to check for _GLIBCXX_CSTDDEF.
........


[SVN r52324]
---
 hash/doc/changes.qbk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 667322b..eed63f1 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -73,5 +73,14 @@
   functional/hash, not functional. `boost/functional/detail/container_fwd.hpp`
   has been moved to `boost/detail/container_fwd.hpp` as it's used outside of
   this library, the others have been moved to `boost/functional/hash/detail`.
+  
+[h2 Boost 1.39.0]
+
+* Move the hash_fwd.hpp implementation into the hash subdirectory, leaving a
+  forwarding header in the old location. You should still use the old location,
+  the new location is mainly for implementation and possible modularization.
+* [@https://svn.boost.org/trac/boost/ticket/2412 Ticket 2412]: Removed deprecated
+  headers.
+
 
 [endsect]

From c09efebd3205bfbf2917a6c678fdc4193a6bf550 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 20 Apr 2009 17:26:14 +0000
Subject: [PATCH 048/111] Fix float support on vxWorks.

Thanks to Dustin Spicuzza. Fixes #2957

Merged revisions 52481 via svnmerge from
https://svn.boost.org/svn/boost/trunk


[SVN r52517]
---
 include/boost/functional/hash/detail/float_functions.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/boost/functional/hash/detail/float_functions.hpp b/include/boost/functional/hash/detail/float_functions.hpp
index 074b64f..69cf91a 100644
--- a/include/boost/functional/hash/detail/float_functions.hpp
+++ b/include/boost/functional/hash/detail/float_functions.hpp
@@ -59,6 +59,10 @@
 #    define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
 #  endif
 
+// vxWorks. It has its own math library, but uses Dinkumware STL
+#elif defined(__VXWORKS__)
+#  define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
+
 // Dinkumware.
 #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
 // Some versions of Visual C++ don't seem to have the C++ overloads but they

From 10000a9028c732f79c668e2ac9e52852d37d8c8a Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 22 Apr 2009 21:18:03 +0000
Subject: [PATCH 049/111] Add a missing entry to the hash changelog.

Merged revisions 52552 via svnmerge from
https://svn.boost.org/svn/boost/trunk

[SVN r52553]
---
 hash/doc/changes.qbk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index eed63f1..1d4d6d2 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -81,6 +81,7 @@
   the new location is mainly for implementation and possible modularization.
 * [@https://svn.boost.org/trac/boost/ticket/2412 Ticket 2412]: Removed deprecated
   headers.
-
+* [@https://svn.boost.org/trac/boost/ticket/2957 Ticket 2957]: Fix configuration
+  for vxworks.
 
 [endsect]

From 395289026fd5a0ae82aafc0c4d2eec43a45b0f28 Mon Sep 17 00:00:00 2001
From: "Troy D. Straszheim" <troy@resophonic.com>
Date: Thu, 14 May 2009 18:10:23 +0000
Subject: [PATCH 050/111] sync with jamfile

[SVN r52998]
---
 hash/test/CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hash/test/CMakeLists.txt b/hash/test/CMakeLists.txt
index a4e132b..25e3294 100644
--- a/hash/test/CMakeLists.txt
+++ b/hash/test/CMakeLists.txt
@@ -16,13 +16,15 @@ endif(GCC)
 #-------------------------------------------------------------------------
 
 SET(tests
-hash_float_test
 hash_fwd_test_1
 hash_fwd_test_2
 hash_number_test
 hash_pointer_test
 hash_function_pointer_test
 hash_string_test
+hash_float_test
+hash_long_double_test
+hash_string_test
 hash_range_test
 hash_custom_test
 hash_global_namespace_test
@@ -34,6 +36,7 @@ hash_list_test
 hash_deque_test
 hash_set_test
 hash_map_test
+hash_complex_test
 container_fwd_test
 hash_no_ext_macro_1
 hash_no_ext_macro_2
@@ -48,4 +51,3 @@ endforeach(test ${tests})
 
 boost_test_compile_fail(hash_no_ext_fail_test)
 
-# build-project ../examples ;

From 0bbb174bf9dce427cf3a9b67eb2b012821c3e5f9 Mon Sep 17 00:00:00 2001
From: "Troy D. Straszheim" <troy@resophonic.com>
Date: Thu, 14 May 2009 19:58:42 +0000
Subject: [PATCH 051/111] more cmakefile tweaks

[SVN r52999]
---
 hash/test/CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hash/test/CMakeLists.txt b/hash/test/CMakeLists.txt
index 25e3294..fd27083 100644
--- a/hash/test/CMakeLists.txt
+++ b/hash/test/CMakeLists.txt
@@ -21,6 +21,8 @@ hash_fwd_test_2
 hash_number_test
 hash_pointer_test
 hash_function_pointer_test
+hash_float_test
+hash_long_double_test
 hash_string_test
 hash_float_test
 hash_long_double_test
@@ -43,8 +45,8 @@ hash_no_ext_macro_2
 )
 
 boost_test_run(link_test link_test.cpp link_test_2.cpp)
-boost_test_run(link_ext_test link_ext_test.cpp link_no_ext_test.cpp)
-
+boost_test_run(link_ext_test link_ext_test.cpp link_no_ext_test.cpp
+)
 foreach(test ${tests})
   boost_test_run(${test})
 endforeach(test ${tests})

From 29481031e849c4a1bb9d06c854fc8f08c1dbac38 Mon Sep 17 00:00:00 2001
From: "Troy D. Straszheim" <troy@resophonic.com>
Date: Thu, 14 May 2009 20:55:39 +0000
Subject: [PATCH 052/111] undoing bad commit to functional's cmakelists

[SVN r53002]
---
 hash/test/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hash/test/CMakeLists.txt b/hash/test/CMakeLists.txt
index fd27083..0eea9c0 100644
--- a/hash/test/CMakeLists.txt
+++ b/hash/test/CMakeLists.txt
@@ -24,9 +24,6 @@ hash_function_pointer_test
 hash_float_test
 hash_long_double_test
 hash_string_test
-hash_float_test
-hash_long_double_test
-hash_string_test
 hash_range_test
 hash_custom_test
 hash_global_namespace_test

From 0ec3dac78d578d311e38bc4f83a4ab2cd3949b4c Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 25 May 2009 20:06:26 +0000
Subject: [PATCH 053/111] Use local copy of the valid HTML 4.01 icon, and make
 sure all the pages that use it are valid.

Merged revisions 53047-53048 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r53047 | danieljames | 2009-05-16 15:17:20 +0100 (Sat, 16 May 2009) | 1 line

  Fix some validation errors.
........
  r53048 | danieljames | 2009-05-16 15:23:59 +0100 (Sat, 16 May 2009) | 1 line

  Use a local copy of the valid HTML 4.01 icon.
........


[SVN r53258]
---
 binders.html         | 2 +-
 function_traits.html | 2 +-
 index.html           | 2 +-
 mem_fun.html         | 2 +-
 negators.html        | 2 +-
 ptr_fun.html         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/binders.html b/binders.html
index f30ed90..30c2c4b 100644
--- a/binders.html
+++ b/binders.html
@@ -144,7 +144,7 @@ binder2nd(const Operation&amp; x,
   <hr>
 
   <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
-  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  "../../doc/images/valid-html401.png" alt="Valid HTML 4.01 Transitional"
   height="31" width="88"></a></p>
 
   <p>Revised 
diff --git a/function_traits.html b/function_traits.html
index 65fbd9f..c0ce510 100644
--- a/function_traits.html
+++ b/function_traits.html
@@ -216,7 +216,7 @@ class unary_negate : // ...
   <hr>
 
   <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
-  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  "../../doc/images/valid-html401.png" alt="Valid HTML 4.01 Transitional"
   height="31" width="88"></a></p>
 
   <p>Revised 
diff --git a/index.html b/index.html
index 29ea0d2..86d8bac 100644
--- a/index.html
+++ b/index.html
@@ -246,7 +246,7 @@ std::for_each(c.begin(), c.end(),
   <hr>
 
   <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
-  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  "../../doc/images/valid-html401.png" alt="Valid HTML 4.01 Transitional"
   height="31" width="88"></a></p>
 
   <p>Revised 
diff --git a/mem_fun.html b/mem_fun.html
index 901ec2a..23dc102 100644
--- a/mem_fun.html
+++ b/mem_fun.html
@@ -185,7 +185,7 @@ S operator()(T* p, typename call_traits&lt;A&gt;::param_type x) const
   <hr>
 
   <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
-  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  "../../doc/images/valid-html401.png" alt="Valid HTML 4.01 Transitional"
   height="31" width="88"></a></p>
 
   <p>Revised 
diff --git a/negators.html b/negators.html
index 226b0d0..9d31750 100644
--- a/negators.html
+++ b/negators.html
@@ -141,7 +141,7 @@ bool operator()(typename call_traits&lt;typename Predicate::argument_type&gt;::p
   <hr>
 
   <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
-  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  "../../doc/images/valid-html401.png" alt="Valid HTML 4.01 Transitional"
   height="31" width="88"></a></p>
 
   <p>Revised 
diff --git a/ptr_fun.html b/ptr_fun.html
index 10c0ac3..0dc62b4 100644
--- a/ptr_fun.html
+++ b/ptr_fun.html
@@ -141,7 +141,7 @@ Result operator()(typename call_traits&lt;Arg&gt;::param_type x) const
   <hr>
 
   <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
-  "http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01 Transitional"
+  "../../doc/images/valid-html401.png" alt="Valid HTML 4.01 Transitional"
   height="31" width="88"></a></p>
 
   <p>Revised 

From 1c701a70bb7e2513fb31d00fd80c920721a30c5f Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 28 May 2009 20:42:55 +0000
Subject: [PATCH 054/111] Automatically detect what float functions the
 compiler/library supports in hash and seperate out some of the detail
 headers.

Merged revisions 53159-53161,53167-53169,53175,53185,53205,53247-53248,53254 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r53159 | danieljames | 2009-05-21 22:21:11 +0100 (Thu, 21 May 2009) | 1 line

  Move the hash limits workaround into its own file.
........
  r53160 | danieljames | 2009-05-21 22:21:44 +0100 (Thu, 21 May 2009) | 1 line

  Move the two different hash float implementation into their own header.
........
  r53161 | danieljames | 2009-05-21 22:22:04 +0100 (Thu, 21 May 2009) | 1 line

  Try to automatically detect which float functions are available.
........
  r53167 | danieljames | 2009-05-22 07:00:56 +0100 (Fri, 22 May 2009) | 1 line

  Fix a typo.
........
  r53168 | danieljames | 2009-05-22 07:01:19 +0100 (Fri, 22 May 2009) | 3 lines

  Spell out exactly which functions can be used with which types.

  I was hitting some ambiguity errors when the function was for the wrong type.
........
  r53169 | danieljames | 2009-05-22 07:01:35 +0100 (Fri, 22 May 2009) | 1 line

  Some STLport fixes for hash.
........
  r53175 | danieljames | 2009-05-22 14:35:56 +0100 (Fri, 22 May 2009) | 2 lines

  Rename struct to avoid using 'type::'type' which confuses some
  compilers.
........
  r53185 | danieljames | 2009-05-22 20:00:35 +0100 (Fri, 22 May 2009) | 1 line

  Explicitly qualify 'none' to avoid confusion with boost::none.
........
  r53205 | danieljames | 2009-05-23 16:21:38 +0100 (Sat, 23 May 2009) | 4 lines

  Try to deal with macros for frexpl and ldexpl.

  The error message for msvc-9.0~wm5~stlport5.2 suggests that frexpl and ldexpl
  are macros.
........
  r53247 | danieljames | 2009-05-25 14:45:16 +0100 (Mon, 25 May 2009) | 4 lines

  Check for float functions with less templates.

  The only template mechanism now used is full specialization, so this should
  hopefully be more portable to compilers we don't test.
........
  r53248 | danieljames | 2009-05-25 15:27:00 +0100 (Mon, 25 May 2009) | 1 line

  Fix a couple of clumsy errors in the last commit.
........
  r53254 | danieljames | 2009-05-25 20:44:52 +0100 (Mon, 25 May 2009) | 1 line

  Hash change log.
........


[SVN r53361]
---
 hash/doc/changes.qbk                          |   6 +
 hash/test/hash_float_test.hpp                 |  23 +-
 hash/test/hash_function_pointer_test.cpp      |   1 -
 hash/test/hash_number_test.cpp                |   2 +-
 hash/test/hash_string_test.cpp                |   1 -
 .../hash/detail/float_functions.hpp           | 316 +++++++++++-------
 .../functional/hash/detail/hash_float.hpp     | 164 +++------
 .../hash/detail/hash_float_generic.hpp        |  93 ++++++
 .../functional/hash/detail/hash_float_x86.hpp |  56 ++++
 .../boost/functional/hash/detail/limits.hpp   |  61 ++++
 include/boost/functional/hash/hash.hpp        |   1 +
 11 files changed, 474 insertions(+), 250 deletions(-)
 create mode 100644 include/boost/functional/hash/detail/hash_float_generic.hpp
 create mode 100644 include/boost/functional/hash/detail/hash_float_x86.hpp
 create mode 100644 include/boost/functional/hash/detail/limits.hpp

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 1d4d6d2..5ee9150 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -84,4 +84,10 @@
 * [@https://svn.boost.org/trac/boost/ticket/2957 Ticket 2957]: Fix configuration
   for vxworks.
 
+[h2 Boost 1.40.0]
+
+* Automatically configure the float functions using template metaprogramming
+  instead of trying to configure every possibility manually.
+* Workaround for when STLport doesn't support long double.
+
 [endsect]
diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
index eef49b2..77c652c 100644
--- a/hash/test/hash_float_test.hpp
+++ b/hash/test/hash_float_test.hpp
@@ -14,7 +14,7 @@
 #include <boost/detail/lightweight_test.hpp>
 
 #include <cmath>
-#include <boost/limits.hpp>
+#include <boost/functional/hash/detail/limits.hpp>
 
 #include <iostream>
 
@@ -23,6 +23,10 @@
 #pragma warning(disable:4127) // conditional expression is constant
 #endif
 
+char const* float_type(float*) { return "float"; }
+char const* float_type(double*) { return "double"; }
+char const* float_type(long double*) { return "long double"; }
+
 template <class T>
 void float_tests(char const* name, T* = 0)
 {
@@ -36,6 +40,15 @@ void float_tests(char const* name, T* = 0)
         <<"boost::hash_detail::limits<std::size_t>::digits = "
             <<boost::hash_detail::limits<std::size_t>::digits<<"\n"
         <<"\n"
+        <<"boost::hash_detail::call_ldexp<T>::float_type = "
+            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_ldexp<T>::float_type*)0)<<"\n"
+        <<"boost::call_frexp<T>::float_type = "
+            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_frexp<T>::float_type*)0)<<"\n"
+        <<"boost::hash_detail::call_frexp<T>::float_type = "
+            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_frexp<T>::float_type*)0)<<"\n"
+        <<"boost::hash_detail::select_hash_type<T>::type = "
+            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::select_hash_type<T>::type*)0)<<"\n"
+        <<"\n"
         ;
 
     HASH_NAMESPACE::hash<T> x1;
@@ -112,6 +125,14 @@ void float_tests(char const* name, T* = 0)
     T half_max = max / 2;
     T quarter_max = max / 4;
     T three_quarter_max = max - quarter_max;
+    
+    // Check the limits::max is in range.
+    BOOST_TEST(max != half_max);
+    BOOST_TEST(max != quarter_max);
+    BOOST_TEST(max != three_quarter_max);
+    BOOST_TEST(half_max != quarter_max);
+    BOOST_TEST(half_max != three_quarter_max);
+    BOOST_TEST(quarter_max != three_quarter_max);
 
     BOOST_TEST(x1(max) == HASH_NAMESPACE::hash_value(max));
     BOOST_TEST(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp
index 7fa4c89..73719e2 100644
--- a/hash/test/hash_function_pointer_test.cpp
+++ b/hash/test/hash_function_pointer_test.cpp
@@ -13,7 +13,6 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/limits.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index 1000258..88e03bd 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -15,7 +15,7 @@
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/preprocessor/cat.hpp>
-#include <boost/limits.hpp>
+#include <boost/functional/hash/detail/limits.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 
diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp
index 85f5a0d..b3b8394 100644
--- a/hash/test/hash_string_test.cpp
+++ b/hash/test/hash_string_test.cpp
@@ -13,7 +13,6 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/limits.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <string>
diff --git a/include/boost/functional/hash/detail/float_functions.hpp b/include/boost/functional/hash/detail/float_functions.hpp
index 69cf91a..60dbb2a 100644
--- a/include/boost/functional/hash/detail/float_functions.hpp
+++ b/include/boost/functional/hash/detail/float_functions.hpp
@@ -6,6 +6,7 @@
 #if !defined(BOOST_FUNCTIONAL_HASH_DETAIL_FLOAT_FUNCTIONS_HPP)
 #define BOOST_FUNCTIONAL_HASH_DETAIL_FLOAT_FUNCTIONS_HPP
 
+#include <boost/config.hpp>
 #include <boost/config/no_tr1/cmath.hpp>
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
@@ -17,146 +18,221 @@
 // library implementations don't support this. On some that don't, the C99
 // float functions (frexpf, frexpl, etc.) are available.
 //
-// Some of this is based on guess work. If I don't know any better I assume that
-// the standard C++ overloaded functions are available. If they're not then this
-// means that the argument is cast to a double and back, which is inefficient
-// and will give pretty bad results for long doubles - so if you know better
-// let me know.
+// The following tries to automatically detect which are available.
 
-// STLport:
-#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
-#  if (defined(__GNUC__) && __GNUC__ < 3 && (defined(linux) || defined(__linux) || defined(__linux__))) || defined(__DMC__)
-#    define BOOST_HASH_USE_C99_FLOAT_FUNCS
-#  elif defined(BOOST_MSVC) && BOOST_MSVC < 1300
-#    define BOOST_HASH_USE_C99_FLOAT_FUNCS
-#  else
-#    define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
-#  endif
+namespace boost {
+    namespace hash_detail {
 
-// Roguewave:
+        // Returned by dummy versions of the float functions.
+    
+        struct not_found {
+            // Implicitly convertible to float and long double in order to avoid
+            // a compile error when the dummy float functions are used.
+
+            inline operator float() const { return 0; }
+            inline operator long double() const { return 0; }
+        };
+          
+        // A type for detecting the return type of functions.
+
+        template <typename T> struct is;
+        template <> struct is<float> { char x[10]; };
+        template <> struct is<double> { char x[20]; };
+        template <> struct is<long double> { char x[30]; };
+        template <> struct is<boost::hash_detail::not_found> { char x[40]; };
+            
+        // Used to convert the return type of a function to a type for sizeof.
+
+        template <typename T> is<T> float_type(T);
+
+        // call_ldexp
+        //
+        // This will get specialized for float and long double
+        
+        template <typename Float> struct call_ldexp
+        {
+            typedef double float_type;
+            
+            inline double operator()(double a, int b) const
+            {
+                using namespace std;
+                return ldexp(a, b);
+            }
+        };
+
+        // call_frexp
+        //
+        // This will get specialized for float and long double
+
+        template <typename Float> struct call_frexp
+        {
+            typedef double float_type;
+            
+            inline double operator()(double a, int* b) const
+            {
+                using namespace std;
+                return frexp(a, b);
+            }
+        };
+    }
+}
+            
+// A namespace for dummy functions to detect when the actual function we want
+// isn't available. ldexpl, ldexpf etc. might be added tby the macros below.
 //
-// On borland 5.51, with roguewave 2.1.1 the standard C++ overloads aren't
-// defined, but for the same version of roguewave on sunpro they are.
-#elif defined(_RWSTD_VER)
-#  if defined(__BORLANDC__)
-#    define BOOST_HASH_USE_C99_FLOAT_FUNCS
-#    define BOOST_HASH_C99_NO_FLOAT_FUNCS
-#  elif defined(__DECCXX)
-#    define BOOST_HASH_USE_C99_FLOAT_FUNCS
-#  else
-#    define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
-#  endif
+// AFAICT these have to be outside of the boost namespace, as if they're in
+// the boost namespace they'll always be preferable to any other function
+// (since the arguments are built in types, ADL can't be used).
 
-// libstdc++ (gcc 3.0 onwards, I think)
-#elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
-#  define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
+namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS {
+    template <class Float> boost::hash_detail::not_found ldexp(Float, int);
+    template <class Float> boost::hash_detail::not_found frexp(Float, int*);    
+}
 
-// SGI:
-#elif defined(__STL_CONFIG_H)
-#  if defined(linux) || defined(__linux) || defined(__linux__)
-#    define BOOST_HASH_USE_C99_FLOAT_FUNCS
-#  else
-#    define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
-#  endif
+// Macros for generating specializations of call_ldexp and call_frexp.
+//
+// check_cpp and check_c99 check if the C++ or C99 functions are available.
+//
+// Then the call_* functions select an appropriate implementation.
+//
+// I used c99_func in a few places just to get a unique name.
 
-// vxWorks. It has its own math library, but uses Dinkumware STL
-#elif defined(__VXWORKS__)
-#  define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
+#define BOOST_HASH_CALL_FLOAT_FUNC(cpp_func, c99_func, type1, type2)    \
+namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS {                           \
+    boost::hash_detail::not_found c99_func(int, type2);                 \
+}                                                                       \
+                                                                        \
+namespace boost {                                                       \
+    namespace hash_detail {                                             \
+        namespace c99_func##_detect {                                   \
+            using namespace std;                                        \
+            using namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS;          \
+                                                                        \
+            struct check {                                              \
+                static type1 x;                                         \
+                static type2 y;                                         \
+                BOOST_STATIC_CONSTANT(bool, cpp =                       \
+                    sizeof(float_type(cpp_func(x,y)))                   \
+                        == sizeof(is<type1>));                          \
+                BOOST_STATIC_CONSTANT(bool, c99 =                       \
+                    sizeof(float_type(c99_func(x,y)))                   \
+                        == sizeof(is<type1>));                          \
+            };                                                          \
+                                                                        \
+            template <bool x>                                           \
+            struct call_c99 :                                           \
+                boost::hash_detail::call_##cpp_func<double> {};         \
+                                                                        \
+            template <>                                                 \
+            struct call_c99<true> {                                     \
+                typedef type1 float_type;                               \
+                                                                        \
+                template <typename T>                                   \
+                inline type1 operator()(type1 a, T b)  const            \
+                {                                                       \
+                    return c99_func(a, b);                              \
+                }                                                       \
+            };                                                          \
+                                                                        \
+            template <bool x>                                           \
+            struct call_cpp :                                           \
+                call_c99<                                               \
+                    ::boost::hash_detail::c99_func##_detect::check::c99 \
+                > {};                                                   \
+                                                                        \
+            template <>                                                 \
+            struct call_cpp<true> {                                     \
+                typedef type1 float_type;                               \
+                                                                        \
+                template <typename T>                                   \
+                inline type1 operator()(type1 a, T b)  const            \
+                {                                                       \
+                    return cpp_func(a, b);                              \
+                }                                                       \
+            };                                                          \
+        }                                                               \
+                                                                        \
+        template <>                                                     \
+        struct call_##cpp_func<type1> :                                 \
+            c99_func##_detect::call_cpp<                                \
+                ::boost::hash_detail::c99_func##_detect::check::cpp     \
+            > {};                                                       \
+    }                                                                   \
+}
 
-// Dinkumware.
-#elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-// Some versions of Visual C++ don't seem to have the C++ overloads but they
-// all seem to have the c99 float overloads
-#  if defined(BOOST_MSVC)
-#    define BOOST_HASH_USE_C99_FLOAT_FUNCS
-// On other platforms the C++ overloads seem to have been introduced sometime
-// before 402.
-#  elif defined(_CPPLIB_VER) && (_CPPLIB_VER >= 402)
-#    define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
-#  else
-#    define BOOST_HASH_USE_C99_FLOAT_FUNCS
-#  endif
+#define BOOST_HASH_CALL_FLOAT_MACRO(cpp_func, c99_func, type1, type2)   \
+namespace boost {                                                       \
+    namespace hash_detail {                                             \
+                                                                        \
+        template <>                                                     \
+        struct call_##cpp_func<type1> {                                 \
+            typedef type1 float_type;                                   \
+            inline type1 operator()(type1 x, type2 y) const {           \
+                return c99_func(x, y);                                  \
+            }                                                           \
+        };                                                              \
+    }                                                                   \
+}
 
-// Digital Mars
-#elif defined(__DMC__)
-#  define BOOST_HASH_USE_C99_FLOAT_FUNCS
-
-// Use overloaded float functions by default.
+#if defined(ldexpf)
+BOOST_HASH_CALL_FLOAT_MACRO(ldexp, ldexpf, float, int)
 #else
-#  define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
+BOOST_HASH_CALL_FLOAT_FUNC(ldexp, ldexpf, float, int)
 #endif
 
+#if defined(ldexpl)
+BOOST_HASH_CALL_FLOAT_MACRO(ldexp, ldexpl, long double, int)
+#else
+BOOST_HASH_CALL_FLOAT_FUNC(ldexp, ldexpl, long double, int)
+#endif
+
+#if defined(frexpf)
+BOOST_HASH_CALL_FLOAT_MACRO(frexp, frexpf, float, int*)
+#else
+BOOST_HASH_CALL_FLOAT_FUNC(frexp, frexpf, float, int*)
+#endif
+
+#if defined(frexpl)
+BOOST_HASH_CALL_FLOAT_MACRO(frexp, frexpl, long double, int*)
+#else
+BOOST_HASH_CALL_FLOAT_FUNC(frexp, frexpl, long double, int*)
+#endif
+
+#undef BOOST_HASH_CALL_FLOAT_MACRO
+#undef BOOST_HASH_CALL_FLOAT_FUNC
+
+
 namespace boost
 {
     namespace hash_detail
     {
+        template <typename Float1, typename Float2>
+        struct select_hash_type_impl {
+            typedef double type;
+        };
 
-        inline float call_ldexp(float v, int exp)
-        {
-            using namespace std;
-#if defined(BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS) || \
-    defined(BOOST_HASH_C99_NO_FLOAT_FUNCS)
-            return ldexp(v, exp);
-#else
-            return ldexpf(v, exp);
-#endif
-        }
+        template <>
+        struct select_hash_type_impl<float, float> {
+            typedef float type;
+        };
 
-        inline double call_ldexp(double v, int exp)
-        {
-            using namespace std;
-            return ldexp(v, exp);
-        }
+        template <>
+        struct select_hash_type_impl<long double, long double> {
+            typedef long double type;
+        };
 
-        inline long double call_ldexp(long double v, int exp)
-        {
-            using namespace std;
-#if defined(BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS)
-            return ldexp(v, exp);
-#else
-            return ldexpl(v, exp);
-#endif
-        }
 
-        inline float call_frexp(float v, int* exp)
-        {
-            using namespace std;
-#if defined(BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS) || \
-    defined(BOOST_HASH_C99_NO_FLOAT_FUNCS)
-            return frexp(v, exp);
-#else
-            return frexpf(v, exp);
-#endif
-        }
-
-        inline double call_frexp(double v, int* exp)
-        {
-            using namespace std;
-            return frexp(v, exp);
-        }
-
-        inline long double call_frexp(long double v, int* exp)
-        {
-            using namespace std;
-#if defined(BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS)
-            return frexp(v, exp);
-#else
-            return frexpl(v, exp);
-#endif
-        }
+        // select_hash_type
+        //
+        // If there is support for a particular floating point type, use that
+        // otherwise use double (there's always support for double).
+             
+        template <typename Float>
+        struct select_hash_type : select_hash_type_impl<
+                BOOST_DEDUCED_TYPENAME call_ldexp<Float>::float_type,
+                BOOST_DEDUCED_TYPENAME call_frexp<Float>::float_type
+            > {};            
     }
 }
 
-#if defined(BOOST_HASH_USE_C99_FLOAT_FUNCS)
-#undef BOOST_HASH_USE_C99_FLOAT_FUNCS
-#endif
-
-#if defined(BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS)
-#undef BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
-#endif
-
-#if defined(BOOST_HASH_C99_NO_FLOAT_FUNCS)
-#undef BOOST_HASH_C99_NO_FLOAT_FUNCS
-#endif
-
 #endif
diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/functional/hash/detail/hash_float.hpp
index 5d5ac34..0137ab7 100644
--- a/include/boost/functional/hash/detail/hash_float.hpp
+++ b/include/boost/functional/hash/detail/hash_float.hpp
@@ -18,156 +18,57 @@
 #endif
 #endif
 
+#include <boost/config.hpp>
 #include <boost/functional/hash/detail/float_functions.hpp>
+#include <boost/functional/hash/detail/limits.hpp>
 #include <boost/integer/static_log2.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/limits.hpp>
 #include <boost/assert.hpp>
 
-// Select implementation for the current platform.
+// Include hash implementation for the current platform.
 
 // Cygwn
 #if defined(__CYGWIN__)
 #  if defined(__i386__) || defined(_M_IX86)
-#    define BOOST_HASH_USE_x86_BINARY_HASH
+#    include <boost/functional/hash/detail/hash_float_x86.hpp>
+#  else
+#    include <boost/functional/hash/detail/hash_float_generic.hpp>
 #  endif
+#else
+#  include <boost/functional/hash/detail/hash_float_generic.hpp>
+#endif
+
+// Can we use fpclassify?
 
 // STLport
-#elif defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
-// fpclassify aren't good enough on STLport.
+#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
+#define BOOST_HASH_USE_FPCLASSIFY 0
 
 // GNU libstdc++ 3
 #elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
 #  if (defined(__USE_ISOC99) || defined(_GLIBCXX_USE_C99_MATH)) && \
       !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__))
-#    define BOOST_HASH_USE_FPCLASSIFY
+#    define BOOST_HASH_USE_FPCLASSIFY 1
+#  else
+#    define BOOST_HASH_USE_FPCLASSIFY 0
 #  endif
 
-// Dinkumware Library, on Visual C++ 
-#elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-
-// Not using _fpclass because it is only available for double.
-
+// Everything else
+#else
+#  define BOOST_HASH_USE_FPCLASSIFY 0
 #endif
 
-// On OpenBSD, numeric_limits is not reliable for long doubles, but
-// the macros defined in <float.h> are.
+#if BOOST_HASH_USE_FPCLASSIFY
 
-#if defined(__OpenBSD__)
-#include <float.h>
-#endif
+#include <boost/config/no_tr1/cmath.hpp>
 
 namespace boost
 {
     namespace hash_detail
     {
-        template <class T>
-        struct limits : std::numeric_limits<T> {};
-
-#if defined(__OpenBSD__)
-        template <>
-        struct limits<long double>
-             : std::numeric_limits<long double>
-        {
-            static long double epsilon() {
-                return LDBL_EPSILON;
-            }
-
-            static long double (max)() {
-                return LDBL_MAX;
-            }
-
-            static long double (min)() {
-                return LDBL_MIN;
-            }
-
-            BOOST_STATIC_CONSTANT(int, digits = LDBL_MANT_DIG);
-            BOOST_STATIC_CONSTANT(int, max_exponent = LDBL_MAX_EXP);
-            BOOST_STATIC_CONSTANT(int, min_exponent = LDBL_MIN_EXP);
-        };
-#endif // __OpenBSD__
-
-        inline void hash_float_combine(std::size_t& seed, std::size_t value)
-        {
-            seed ^= value + (seed<<6) + (seed>>2);
-        }
-
-// A simple, non-portable hash algorithm for x86.
-#if defined(BOOST_HASH_USE_x86_BINARY_HASH)
-        inline std::size_t float_hash_impl(float v)
-        {
-            boost::uint32_t* ptr = (boost::uint32_t*)&v;
-            std::size_t seed = *ptr;
-            return seed;
-        }
-
-        inline std::size_t float_hash_impl(double v)
-        {
-            boost::uint32_t* ptr = (boost::uint32_t*)&v;
-            std::size_t seed = *ptr++;
-            hash_float_combine(seed, *ptr);
-            return seed;
-        }
-
-        inline std::size_t float_hash_impl(long double v)
-        {
-            boost::uint32_t* ptr = (boost::uint32_t*)&v;
-            std::size_t seed = *ptr++;
-            hash_float_combine(seed, *ptr++);
-            hash_float_combine(seed, *(boost::uint16_t*)ptr);
-            return seed;
-        }
-
-#else
-
-        template <class T>
-        inline std::size_t float_hash_impl(T v)
-        {
-            int exp = 0;
-
-            v = boost::hash_detail::call_frexp(v, &exp);
-
-            // A postive value is easier to hash, so combine the
-            // sign with the exponent.
-            if(v < 0) {
-                v = -v;
-                exp += limits<T>::max_exponent -
-                    limits<T>::min_exponent;
-            }
-
-            // The result of frexp is always between 0.5 and 1, so its
-            // top bit will always be 1. Subtract by 0.5 to remove that.
-            v -= T(0.5);
-            v = boost::hash_detail::call_ldexp(v,
-                    limits<std::size_t>::digits + 1);
-            std::size_t seed = static_cast<std::size_t>(v);
-            v -= seed;
-
-            // ceiling(digits(T) * log2(radix(T))/ digits(size_t)) - 1;
-            std::size_t const length
-                = (limits<T>::digits *
-                        boost::static_log2<limits<T>::radix>::value - 1)
-                / limits<std::size_t>::digits;
-
-            for(std::size_t i = 0; i != length; ++i)
-            {
-                v = boost::hash_detail::call_ldexp(v,
-                        limits<std::size_t>::digits);
-                std::size_t part = static_cast<std::size_t>(v);
-                v -= part;
-                hash_float_combine(seed, part);
-            }
-
-            hash_float_combine(seed, exp);
-
-            return seed;
-        }
-#endif
-
         template <class T>
         inline std::size_t float_hash_value(T v)
         {
-#if defined(BOOST_HASH_USE_FPCLASSIFY)
             using namespace std;
             switch (fpclassify(v)) {
             case FP_ZERO:
@@ -183,15 +84,26 @@ namespace boost
                 BOOST_ASSERT(0);
                 return 0;
             }
-#else
-            return v == 0 ? 0 : float_hash_impl(v);
-#endif
         }
     }
 }
 
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
+#else // !BOOST_HASH_USE_FPCLASSIFY
+
+namespace boost
+{
+    namespace hash_detail
+    {
+        template <class T>
+        inline std::size_t float_hash_value(T v)
+        {
+            return v == 0 ? 0 : float_hash_impl(v);
+        }
+    }
+}
+
+#endif // BOOST_HASH_USE_FPCLASSIFY
+
+#undef BOOST_HASH_USE_FPCLASSIFY
 
 #endif
diff --git a/include/boost/functional/hash/detail/hash_float_generic.hpp b/include/boost/functional/hash/detail/hash_float_generic.hpp
new file mode 100644
index 0000000..164e18a
--- /dev/null
+++ b/include/boost/functional/hash/detail/hash_float_generic.hpp
@@ -0,0 +1,93 @@
+
+// Copyright 2005-2009 Daniel James.
+// Distributed under 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)
+
+// A general purpose hash function for non-zero floating point values.
+
+#if !defined(BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_GENERIC_HEADER)
+#define BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_GENERIC_HEADER
+
+#include <boost/functional/hash/detail/float_functions.hpp>
+#include <boost/integer/static_log2.hpp>
+#include <boost/functional/hash/detail/limits.hpp>
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#if BOOST_MSVC >= 1400
+#pragma warning(disable:6294) // Ill-defined for-loop: initial condition does
+                              // not satisfy test. Loop body not executed 
+#endif
+#endif
+
+namespace boost
+{
+    namespace hash_detail
+    {
+        inline void hash_float_combine(std::size_t& seed, std::size_t value)
+        {
+            seed ^= value + (seed<<6) + (seed>>2);
+        }
+
+        template <class T>
+        inline std::size_t float_hash_impl2(T v)
+        {
+            boost::hash_detail::call_frexp<T> frexp;
+            boost::hash_detail::call_ldexp<T> ldexp;
+        
+            int exp = 0;
+
+            v = frexp(v, &exp);
+
+            // A postive value is easier to hash, so combine the
+            // sign with the exponent and use the absolute value.
+            if(v < 0) {
+                v = -v;
+                exp += limits<T>::max_exponent -
+                    limits<T>::min_exponent;
+            }
+
+            // The result of frexp is always between 0.5 and 1, so its
+            // top bit will always be 1. Subtract by 0.5 to remove that.
+            v -= T(0.5);
+            v = ldexp(v, limits<std::size_t>::digits + 1);
+            std::size_t seed = static_cast<std::size_t>(v);
+            v -= seed;
+
+            // ceiling(digits(T) * log2(radix(T))/ digits(size_t)) - 1;
+            std::size_t const length
+                = (limits<T>::digits *
+                        boost::static_log2<limits<T>::radix>::value - 1)
+                / limits<std::size_t>::digits;
+
+            for(std::size_t i = 0; i != length; ++i)
+            {
+                v = ldexp(v, limits<std::size_t>::digits);
+                std::size_t part = static_cast<std::size_t>(v);
+                v -= part;
+                hash_float_combine(seed, part);
+            }
+
+            hash_float_combine(seed, exp);
+
+            return seed;
+        };
+
+        template <class T>
+        inline std::size_t float_hash_impl(T v)
+        {
+            typedef BOOST_DEDUCED_TYPENAME select_hash_type<T>::type type;
+            return float_hash_impl2(static_cast<type>(v));
+        }
+    }
+}
+
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
+#endif
diff --git a/include/boost/functional/hash/detail/hash_float_x86.hpp b/include/boost/functional/hash/detail/hash_float_x86.hpp
new file mode 100644
index 0000000..b39bb0d
--- /dev/null
+++ b/include/boost/functional/hash/detail/hash_float_x86.hpp
@@ -0,0 +1,56 @@
+
+// Copyright 2005-2009 Daniel James.
+// Distributed under 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)
+
+// A non-portable hash function form non-zero floats on x86.
+//
+// Even if you're on an x86 platform, this might not work if their floating
+// point isn't set up as this expects. So this should only be used if it's
+// absolutely certain that it will work.
+
+#if !defined(BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_X86_HEADER)
+#define BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_X86_HEADER
+
+#include <boost/cstdint.hpp>
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+namespace boost
+{
+    namespace hash_detail
+    {
+        inline void hash_float_combine(std::size_t& seed, std::size_t value)
+        {
+            seed ^= value + (seed<<6) + (seed>>2);
+        }
+
+        inline std::size_t float_hash_impl(float v)
+        {
+            boost::uint32_t* ptr = (boost::uint32_t*)&v;
+            std::size_t seed = *ptr;
+            return seed;
+        }
+
+        inline std::size_t float_hash_impl(double v)
+        {
+            boost::uint32_t* ptr = (boost::uint32_t*)&v;
+            std::size_t seed = *ptr++;
+            hash_float_combine(seed, *ptr);
+            return seed;
+        }
+
+        inline std::size_t float_hash_impl(long double v)
+        {
+            boost::uint32_t* ptr = (boost::uint32_t*)&v;
+            std::size_t seed = *ptr++;
+            hash_float_combine(seed, *ptr++);
+            hash_float_combine(seed, *(boost::uint16_t*)ptr);
+            return seed;
+        }
+    }
+}
+
+#endif
diff --git a/include/boost/functional/hash/detail/limits.hpp b/include/boost/functional/hash/detail/limits.hpp
new file mode 100644
index 0000000..f5b520e
--- /dev/null
+++ b/include/boost/functional/hash/detail/limits.hpp
@@ -0,0 +1,61 @@
+
+// Copyright 2005-2009 Daniel James.
+// Distributed under 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)
+//
+// On some platforms std::limits gives incorrect values for long double.
+// This tries to work around them.
+
+#if !defined(BOOST_FUNCTIONAL_HASH_DETAIL_LIMITS_HEADER)
+#define BOOST_FUNCTIONAL_HASH_DETAIL_LIMITS_HEADER
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/limits.hpp>
+
+// On OpenBSD, numeric_limits is not reliable for long doubles, but
+// the macros defined in <float.h> are and support long double when STLport
+// doesn't.
+
+#if defined(__OpenBSD__) || defined(_STLP_NO_LONG_DOUBLE)
+#include <float.h>
+#endif
+
+namespace boost
+{
+    namespace hash_detail
+    {
+        template <class T>
+        struct limits : std::numeric_limits<T> {};
+
+#if defined(__OpenBSD__) || defined(_STLP_NO_LONG_DOUBLE)
+        template <>
+        struct limits<long double>
+             : std::numeric_limits<long double>
+        {
+            static long double epsilon() {
+                return LDBL_EPSILON;
+            }
+
+            static long double (max)() {
+                return LDBL_MAX;
+            }
+
+            static long double (min)() {
+                return LDBL_MIN;
+            }
+
+            BOOST_STATIC_CONSTANT(int, digits = LDBL_MANT_DIG);
+            BOOST_STATIC_CONSTANT(int, max_exponent = LDBL_MAX_EXP);
+            BOOST_STATIC_CONSTANT(int, min_exponent = LDBL_MIN_EXP);
+#if defined(_STLP_NO_LONG_DOUBLE)
+            BOOST_STATIC_CONSTANT(int, radix = FLT_RADIX);
+#endif
+        };
+#endif // __OpenBSD__
+    }
+}
+
+#endif
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 67284fc..12283ff 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -15,6 +15,7 @@
 #include <boost/functional/hash/detail/hash_float.hpp>
 #include <boost/detail/container_fwd.hpp>
 #include <string>
+#include <boost/limits.hpp>
 
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 #include <boost/type_traits/is_pointer.hpp>

From 594caeb0afe02531accc66f5fa106f23c9a7d7c3 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 30 May 2009 17:45:06 +0000
Subject: [PATCH 055/111] Fix gcc -pedantic error:extra  extra ';'

Merged revisions 53203 via svnmerge from
https://svn.boost.org/svn/boost/trunk


[SVN r53467]
---
 include/boost/functional/hash/detail/hash_float_generic.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/functional/hash/detail/hash_float_generic.hpp b/include/boost/functional/hash/detail/hash_float_generic.hpp
index 164e18a..f9acee9 100644
--- a/include/boost/functional/hash/detail/hash_float_generic.hpp
+++ b/include/boost/functional/hash/detail/hash_float_generic.hpp
@@ -75,7 +75,7 @@ namespace boost
             hash_float_combine(seed, exp);
 
             return seed;
-        };
+        }
 
         template <class T>
         inline std::size_t float_hash_impl(T v)

From 697c7f95dd02af02c1f1b4c7554c34fa9d15a6bd Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 6 Jun 2009 13:53:19 +0000
Subject: [PATCH 056/111] Minor hash test changes.

Merged revisions 53522-53523 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r53522 | danieljames | 2009-06-01 07:49:45 +0100 (Mon, 01 Jun 2009) | 1 line

  Test the hash functions for a couple of typedefs.
........
  r53523 | danieljames | 2009-06-01 07:50:14 +0100 (Mon, 01 Jun 2009) | 2 lines

  Recent versions of borland haven't fixed some of their namespace bugs, so mark
  up their hash failures for all versions.
........


[SVN r53686]
---
 hash/test/hash_number_test.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index 88e03bd..40febc7 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -157,6 +157,9 @@ int main()
     NUMERIC_TEST(float, float)
     NUMERIC_TEST(double, double)
 
+    NUMERIC_TEST(std::size_t, size_t)
+    NUMERIC_TEST(std::ptrdiff_t, ptrdiff_t)
+
     bool_test();
 
     return boost::report_errors();

From f59992a3f7a08e8b481799fe18e09fbbcc70a432 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 6 Jun 2009 14:05:54 +0000
Subject: [PATCH 057/111] Misc. unordered changes. Fixes #3082, #3119.

Merged revisions 53505-53506,53525,53550,53552,53614 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r53505 | danieljames | 2009-05-31 16:50:56 +0100 (Sun, 31 May 2009) | 1 line

  Disable incorrect Visual C++ 64-bit warnings. Ref #3082.
........
  r53506 | danieljames | 2009-05-31 16:53:09 +0100 (Sun, 31 May 2009) | 1 line

  Remove misplaced visual C++ warning pragma.
........
  r53525 | danieljames | 2009-06-01 07:50:37 +0100 (Mon, 01 Jun 2009) | 1 line

  Fix tests for when the library has support for initializer lists but the compiler doesn't.
........
  r53550 | danieljames | 2009-06-01 20:17:49 +0100 (Mon, 01 Jun 2009) | 1 line

  Get the type of the initializer_list right.
........
  r53552 | danieljames | 2009-06-01 20:22:27 +0100 (Mon, 01 Jun 2009) | 1 line

  Fix the unordered_map declaration in the tutorial. Fixes #3119.
........
  r53614 | danieljames | 2009-06-03 23:48:49 +0100 (Wed, 03 Jun 2009) | 1 line

  The move tests pass on 64 bit visual c++.
........


[SVN r53687]
---
 include/boost/functional/hash/detail/hash_float.hpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/functional/hash/detail/hash_float.hpp
index 0137ab7..ea1bc25 100644
--- a/include/boost/functional/hash/detail/hash_float.hpp
+++ b/include/boost/functional/hash/detail/hash_float.hpp
@@ -10,14 +10,6 @@
 # pragma once
 #endif
 
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-#if BOOST_MSVC >= 1400
-#pragma warning(disable:6294) // Ill-defined for-loop: initial condition does
-                              // not satisfy test. Loop body not executed 
-#endif
-#endif
-
 #include <boost/config.hpp>
 #include <boost/functional/hash/detail/float_functions.hpp>
 #include <boost/functional/hash/detail/limits.hpp>

From 9f2b8346be1bc5edd13e8e1e6fc70ab4a284ed97 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 27 Jun 2009 08:12:20 +0000
Subject: [PATCH 058/111] Merge latest hash developments:

 * Avoid float to int warning.
 * Work around 'using namespace' bug in Visual C++.
 * Make `<boost/functional/hash/extensions.hpp> self contained.
 * Move some of the extension implementation from the main hash header
   into the exensions header.
 * Remove BOOST_HASH_CHAR_TRAITS from `container_fwd.hpp`.
 * Other minor changes.

Merged revisions 53828,53924,54024-54025,54033-54034,54139-54145,54399 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r53828 | danieljames | 2009-06-12 19:24:47 +0100 (Fri, 12 Jun 2009) | 1 line

  Try to avoid float to int warning when a float function doesn't exist.
........
  r53924 | danieljames | 2009-06-15 08:37:42 +0100 (Mon, 15 Jun 2009) | 4 lines

  Remove hash_complex_test's dependency on Boost.Random.

  Only test for a few values, but that should be okay as there isn't much
  to test.
........
  r54024 | danieljames | 2009-06-17 22:22:49 +0100 (Wed, 17 Jun 2009) | 1 line

  Put the minimum amount of implementation in the same namespace as the 'using namespace' directives in order to avoid Visual C++ 8 bug.
........
  r54025 | danieljames | 2009-06-17 22:23:42 +0100 (Wed, 17 Jun 2009) | 1 line

  Try to avoid using special macro handling code.
........
  r54033 | danieljames | 2009-06-18 00:24:28 +0100 (Thu, 18 Jun 2009) | 1 line

  Add copyright to namespace_fail_test.cpp
........
  r54034 | danieljames | 2009-06-18 00:25:12 +0100 (Thu, 18 Jun 2009) | 1 line

  A couple of missing newlines.
........
  r54139 | danieljames | 2009-06-21 10:41:11 +0100 (Sun, 21 Jun 2009) | 1 line

  A few more comments in boost::hash.
........
  r54140 | danieljames | 2009-06-21 10:41:30 +0100 (Sun, 21 Jun 2009) | 1 line

  Move includes to the header which they're used in.
........
  r54141 | danieljames | 2009-06-21 10:41:46 +0100 (Sun, 21 Jun 2009) | 1 line

  Revert [54025] "Try to avoid using special macro handling code."
........
  r54142 | danieljames | 2009-06-21 10:42:05 +0100 (Sun, 21 Jun 2009) | 1 line

  Get <boost/functional/hash/extensions.hpp> to work.
........
  r54143 | danieljames | 2009-06-21 10:42:20 +0100 (Sun, 21 Jun 2009) | 1 line

  Move BOOST_HASH_CHAR_TRAITS from container_fwd into the hash headers, and undefine it.
........
  r54144 | danieljames | 2009-06-21 10:42:40 +0100 (Sun, 21 Jun 2009) | 1 line

  Move the support for hashing containers into the extension header, and improve the standard tests.
........
  r54145 | danieljames | 2009-06-21 10:51:59 +0100 (Sun, 21 Jun 2009) | 1 line

  I didn't mean to comment this out.
........
  r54399 | danieljames | 2009-06-27 08:39:12 +0100 (Sat, 27 Jun 2009) | 1 line

  Add am implementation note about the Visual C++ problems.
........


[SVN r54402]
---
 hash/test/Jamfile.v2                          |  13 ++
 hash/test/config.hpp                          |   2 +-
 hash/test/extensions_hpp_test.cpp             |  17 +++
 hash/test/hash_complex_test.cpp               |  60 ++++-----
 hash/test/hash_float_test.hpp                 |  20 ++-
 hash/test/hash_fwd_test_2.cpp                 |  10 +-
 hash/test/hash_no_ext_macro_1.cpp             |   8 ++
 hash/test/hash_no_ext_macro_2.cpp             |   7 +
 hash/test/hash_range_test.cpp                 |  21 +--
 hash/test/link_ext_test.cpp                   |   9 ++
 hash/test/namespace_fail_test.cpp             |  14 ++
 .../hash/detail/float_functions.hpp           |  76 ++++++-----
 include/boost/functional/hash/extensions.hpp  | 110 +++++++++++++++-
 include/boost/functional/hash/hash.hpp        | 122 +++++-------------
 14 files changed, 312 insertions(+), 177 deletions(-)
 create mode 100644 hash/test/extensions_hpp_test.cpp
 create mode 100644 hash/test/namespace_fail_test.cpp

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index ff149a7..ea19365 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -36,10 +36,23 @@ test-suite functional/hash
         [ run hash_complex_test.cpp ]
         [ run link_test.cpp link_test_2.cpp ]
         [ run link_ext_test.cpp link_no_ext_test.cpp ]
+        [ run extensions_hpp_test.cpp ]
         [ run container_fwd_test.cpp ]
         [ compile-fail hash_no_ext_fail_test.cpp ]
+        [ compile-fail namespace_fail_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
         [ run hash_no_ext_macro_2.cpp ]
     ;
 
+test-suite functional/hash_no_ext
+    :
+        [ run hash_number_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_number_test ]
+        [ run hash_pointer_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_pointer_test ]
+        [ run hash_function_pointer_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_function_pointer_test ]
+        [ run hash_float_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_float_test ]
+        [ run hash_long_double_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_long_double_test ]
+        [ run hash_string_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_string_test ]
+        [ run link_test.cpp link_test_2.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_link_test ]
+    ;
+
 build-project ../examples ;
diff --git a/hash/test/config.hpp b/hash/test/config.hpp
index 0f84cc7..1fd0f5f 100644
--- a/hash/test/config.hpp
+++ b/hash/test/config.hpp
@@ -5,7 +5,7 @@
 
 #if defined(TEST_STD)
 #  define TEST_STD_INCLUDES
-#  define HASH_NAMESPACE std::tr1
+#  define HASH_NAMESPACE std
 #else
 #  define HASH_NAMESPACE boost
 #  if !defined(BOOST_HASH_NO_EXTENSIONS)
diff --git a/hash/test/extensions_hpp_test.cpp b/hash/test/extensions_hpp_test.cpp
new file mode 100644
index 0000000..182ec01
--- /dev/null
+++ b/hash/test/extensions_hpp_test.cpp
@@ -0,0 +1,17 @@
+
+// Copyright 2009 Daniel James.
+// Distributed under 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)
+
+// Check that boost/functional/hash/extensions.hpp works okay.
+//
+// It probably should be in boost/functional/hash/detail, but since it isn't it
+// should work.
+
+#include <boost/functional/hash/extensions.hpp>
+
+int main() {
+    int x[2] = { 2, 3 };
+    boost::hash<int[2]> hf;
+    hf(x);
+}
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
index dd519c9..f791391 100644
--- a/hash/test/hash_complex_test.cpp
+++ b/hash/test/hash_complex_test.cpp
@@ -5,18 +5,20 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
-#    include <functional>
-#  else
-#    include <boost/functional/hash.hpp>
-#  endif
+#if !defined(TEST_EXTENSIONS)
+
+int main() {}
+
+#else
+
+#ifdef TEST_STD_INCLUDES
+#  include <functional>
+#else
+#  include <boost/functional/hash.hpp>
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
-
 #include <complex>
 #include <sstream>
 #include <boost/limits.hpp>
@@ -27,11 +29,6 @@
 #pragma warning(disable:4512) // assignment operator could not be generated
 #endif
 
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_int.hpp>
-#include <boost/random/uniform_real.hpp>
-#include <boost/random/variate_generator.hpp>
-
 #if defined(BOOST_MSVC)
 #pragma warning(pop)
 #endif
@@ -61,33 +58,24 @@ void generic_complex_tests(std::complex<T> v)
 template <class Float>
 void complex_float_tests(Float*)
 {
-    boost::mt19937 rng;
-    boost::uniform_real<Float> uniform;
-    boost::variate_generator<boost::mt19937&, boost::uniform_real<Float> >
-        uniform_generator(rng, uniform);
-
-    for(int i = 0; i < 100; ++i)
-    {
-        std::complex<Float> v(uniform_generator(), uniform_generator());
-        generic_complex_tests(v);
-    }
+    typedef std::complex<Float> complex;
+    generic_complex_tests(complex(0,0));
+    generic_complex_tests(complex(0.5,0));
+    generic_complex_tests(complex(25,0));
+    generic_complex_tests(complex(25,0));
+    generic_complex_tests(complex(-67.5324535,56.23578678));
 }
 
 template <class Integer>
 void complex_integral_tests(Integer*)
 {
-    boost::mt19937 rng;
-    boost::uniform_int<Integer> uniform(
-            (std::numeric_limits<Integer>::min)(),
-            (std::numeric_limits<Integer>::max)());
-    boost::variate_generator<boost::mt19937&, boost::uniform_int<Integer> >
-        uniform_generator(rng, uniform);
-
-    for(int i = 0; i < 100; ++i)
-    {
-        std::complex<Integer>v(uniform_generator(), uniform_generator());
-        generic_complex_tests(v);
-    }
+    typedef std::complex<Integer> complex;
+    generic_complex_tests(complex(0,0));
+    generic_complex_tests(complex(15342,124));
+    generic_complex_tests(complex(25,54356));
+    generic_complex_tests(complex(5325,2346));
+    generic_complex_tests(complex(-243897,-49923874));
+    generic_complex_tests(complex(-543,763));
 }
 
 int main()
@@ -105,4 +93,4 @@ int main()
     return boost::report_errors();
 }
 
-#endif
+#endif // TEST_EXTENSIONS
diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
index 77c652c..b1c19fc 100644
--- a/hash/test/hash_float_test.hpp
+++ b/hash/test/hash_float_test.hpp
@@ -15,6 +15,8 @@
 
 #include <cmath>
 #include <boost/functional/hash/detail/limits.hpp>
+#include <boost/functional/hash/detail/float_functions.hpp>
+#include <boost/detail/workaround.hpp>
 
 #include <iostream>
 
@@ -42,8 +44,6 @@ void float_tests(char const* name, T* = 0)
         <<"\n"
         <<"boost::hash_detail::call_ldexp<T>::float_type = "
             <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_ldexp<T>::float_type*)0)<<"\n"
-        <<"boost::call_frexp<T>::float_type = "
-            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_frexp<T>::float_type*)0)<<"\n"
         <<"boost::hash_detail::call_frexp<T>::float_type = "
             <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_frexp<T>::float_type*)0)<<"\n"
         <<"boost::hash_detail::select_hash_type<T>::type = "
@@ -59,8 +59,10 @@ void float_tests(char const* name, T* = 0)
     BOOST_TEST(zero == minus_zero);
     BOOST_TEST(x1(zero) == x1(minus_zero));
 
+#if defined(TEST_EXTENSIONS)
     BOOST_TEST(x1(zero) == HASH_NAMESPACE::hash_value(zero));
     BOOST_TEST(x1(minus_zero) == HASH_NAMESPACE::hash_value(minus_zero));
+#endif
 
     using namespace std;
 
@@ -78,9 +80,11 @@ void float_tests(char const* name, T* = 0)
         T minus_infinity2 = (T) -1. / zero;
         T minus_infinity3 = (T) 1. / minus_zero;
 
+#if defined(TEST_EXTENSIONS)
         BOOST_TEST(x1(infinity) == HASH_NAMESPACE::hash_value(infinity));
         BOOST_TEST(x1(minus_infinity)
                 == HASH_NAMESPACE::hash_value(minus_infinity));
+#endif
 
         if(infinity == infinity2)
             BOOST_TEST(x1(infinity) == x1(infinity2));
@@ -134,10 +138,12 @@ void float_tests(char const* name, T* = 0)
     BOOST_TEST(half_max != three_quarter_max);
     BOOST_TEST(quarter_max != three_quarter_max);
 
+#if defined(TEST_EXTENSIONS)
     BOOST_TEST(x1(max) == HASH_NAMESPACE::hash_value(max));
     BOOST_TEST(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
     BOOST_TEST(x1(quarter_max) == HASH_NAMESPACE::hash_value(quarter_max));
     BOOST_TEST(x1(three_quarter_max) == HASH_NAMESPACE::hash_value(three_quarter_max));
+#endif
 
     // The '!=' tests could legitimately fail, but with my hash it indicates a bug.
     BOOST_TEST(x1(max) == x1(max));
@@ -159,12 +165,18 @@ void float_tests(char const* name, T* = 0)
     T v2 = acos((T) 0);
     if(v1 == v2)
         BOOST_TEST(x1(v1) == x1(v2));
+
+#if defined(TEST_EXTENSIONS)
     BOOST_TEST(x1(v1) == HASH_NAMESPACE::hash_value(v1));
     BOOST_TEST(x1(v2) == HASH_NAMESPACE::hash_value(v2));
 #endif
+    
+#endif
 
+#if defined(TEST_EXTENSIONS)
     BOOST_TEST(x1(boost::hash_detail::limits<T>::epsilon()) ==
             HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::epsilon()));
+#endif
 
     BOOST_TEST(boost::hash_detail::limits<T>::epsilon() != (T) 0);
     if(x1(boost::hash_detail::limits<T>::epsilon()) == x1((T) 0))
@@ -195,7 +207,7 @@ void float_tests(char const* name, T* = 0)
         if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(zero)) {
             std::cerr<<"x1(denorm_min) == x1(zero) == "<<x1(zero)<<"\n";
         }
-#if !BOOST_WORKAROUND(__DECCXX_VER,<70190006)
+#if !BOOST_WORKAROUND(__DECCXX_VER,<70190006) && defined(TEST_EXTENSIONS)
         // The Tru64/CXX standard library prior to 7.1 contains a bug in the
         // specialization of boost::hash_detail::limits::denorm_min() for long
         // doubles which causes this test to fail.
@@ -213,7 +225,7 @@ void float_tests(char const* name, T* = 0)
     }
 
 // NaN also causes borland to crash.
-#if !defined(__BORLANDC__)
+#if !defined(__BORLANDC__) && defined(TEST_EXTENSIONS)
     if(boost::hash_detail::limits<T>::has_quiet_NaN) {
         if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(1.0)) {
             std::cerr<<"x1(quiet_NaN) == x1(1.0) == "<<x1(1.0)<<"\n";
diff --git a/hash/test/hash_fwd_test_2.cpp b/hash/test/hash_fwd_test_2.cpp
index bfa701d..cf6e163 100644
--- a/hash/test/hash_fwd_test_2.cpp
+++ b/hash/test/hash_fwd_test_2.cpp
@@ -6,8 +6,13 @@
 // This test just makes sure a header which uses hash_fwd can compile without
 // the main hash headers.
 
-#include "./hash_fwd_test.hpp"
+#if !defined(TEST_EXTENSIONS) || defined(TEST_STD_INCLUDES)
 
+int main() {}
+
+#else
+
+#include "./hash_fwd_test.hpp"
 #include <boost/detail/lightweight_test.hpp>
 
 template <class T> void unused(T const&) {}
@@ -30,10 +35,11 @@ void fwd_test()
     unused(y1); unused(y2); unused(y3);
 }
 
-
 int main()
 {
     fwd_test();
+
     return boost::report_errors();
 }
 
+#endif // defined(TEST_EXTENSIONS) && !defined(TEST_STD_INCLUDES)
diff --git a/hash/test/hash_no_ext_macro_1.cpp b/hash/test/hash_no_ext_macro_1.cpp
index 640c36a..1d238c0 100644
--- a/hash/test/hash_no_ext_macro_1.cpp
+++ b/hash/test/hash_no_ext_macro_1.cpp
@@ -4,9 +4,17 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
+
+// Include header without BOOST_HASH_NO_EXTENSIONS defined
+#if defined(BOOST_HASH_NO_EXTENSIONS)
+#undef BOOST_HASH_NO_EXTENSIONS
+#endif
 #include <boost/functional/hash.hpp>
+
+// Include header with BOOST_HASH_NO_EXTENSIONS defined
 #define BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
+
 #include <boost/detail/lightweight_test.hpp>
 #include <deque>
 #include <cassert>
diff --git a/hash/test/hash_no_ext_macro_2.cpp b/hash/test/hash_no_ext_macro_2.cpp
index 2f53779..6ab083e 100644
--- a/hash/test/hash_no_ext_macro_2.cpp
+++ b/hash/test/hash_no_ext_macro_2.cpp
@@ -4,10 +4,17 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
+
+// Include header with BOOST_HASH_NO_EXTENSIONS defined
+#if !defined(BOOST_HASH_NO_EXTENSIONS)
 #define BOOST_HASH_NO_EXTENSIONS
+#endif
 #include <boost/functional/hash.hpp>
+
+// Include header without BOOST_HASH_NO_EXTENSIONS defined
 #undef BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
+
 #include <boost/detail/lightweight_test.hpp>
 #include <map>
 
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index 66aad26..7d71f45 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -5,18 +5,20 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
-#    include <functional>
-#  else
-#    include <boost/functional/hash.hpp>
-#  endif
+#if !defined(TEST_EXTENSIONS)
+
+int main() {}
+
+#else
+
+#ifdef TEST_STD_INCLUDES
+#  include <functional>
+#else
+#  include <boost/functional/hash.hpp>
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
-
 #include <boost/limits.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
@@ -74,8 +76,6 @@ void hash_range_tests()
     BOOST_TEST(seed == HASH_NAMESPACE::hash_range(values5.begin(), values5.end()));
 }
 
-#endif
-
 int main()
 {
     hash_range_tests();
@@ -83,3 +83,4 @@ int main()
     return boost::report_errors();
 }
 
+#endif // TEST_EXTESNIONS
diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp
index ca4c8f3..d334035 100644
--- a/hash/test/link_ext_test.cpp
+++ b/hash/test/link_ext_test.cpp
@@ -9,14 +9,23 @@
 #include <vector>
 
 int f(std::size_t hash1, int* x1) {
+
     // Check that HASH_NAMESPACE::hash<int*> works in both files.
     HASH_NAMESPACE::hash<int*> ptr_hasher;
     BOOST_TEST(hash1 == ptr_hasher(x1));
 
+#if defined(TEST_EXTENSIONS)
+
     // Check that std::vector<std::size_t> is avaiable in this file.
     std::vector<std::size_t> x;
     x.push_back(*x1);
     HASH_NAMESPACE::hash<std::vector<std::size_t> > vector_hasher;
     return vector_hasher(x) != HASH_NAMESPACE::hash_value(x);
+    
+#else
+
+    return 0;
+
+#endif
 }
 
diff --git a/hash/test/namespace_fail_test.cpp b/hash/test/namespace_fail_test.cpp
new file mode 100644
index 0000000..d3c13aa
--- /dev/null
+++ b/hash/test/namespace_fail_test.cpp
@@ -0,0 +1,14 @@
+
+// Copyright 2009 Daniel James.
+// Distributed under 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)
+
+// Check that I haven't inadvertantly pulled namespace std into the global
+// namespace.
+
+#include <list>
+#include <boost/functional/hash.hpp>
+
+typedef list<int> foo;
+
+int main() {}
\ No newline at end of file
diff --git a/include/boost/functional/hash/detail/float_functions.hpp b/include/boost/functional/hash/detail/float_functions.hpp
index 60dbb2a..01cac09 100644
--- a/include/boost/functional/hash/detail/float_functions.hpp
+++ b/include/boost/functional/hash/detail/float_functions.hpp
@@ -96,10 +96,16 @@ namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS {
 // Then the call_* functions select an appropriate implementation.
 //
 // I used c99_func in a few places just to get a unique name.
+//
+// Important: when using 'using namespace' at namespace level, include as
+// little as possible in that namespace, as Visual C++ has an odd bug which
+// can cause the namespace to be imported at the global level. This seems to
+// happen mainly when there's a template in the same namesapce.
 
 #define BOOST_HASH_CALL_FLOAT_FUNC(cpp_func, c99_func, type1, type2)    \
 namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS {                           \
-    boost::hash_detail::not_found c99_func(int, type2);                 \
+    template <class Float>                                              \
+    boost::hash_detail::not_found c99_func(Float, type2);               \
 }                                                                       \
                                                                         \
 namespace boost {                                                       \
@@ -117,44 +123,46 @@ namespace boost {                                                       \
                 BOOST_STATIC_CONSTANT(bool, c99 =                       \
                     sizeof(float_type(c99_func(x,y)))                   \
                         == sizeof(is<type1>));                          \
-            };                                                          \
-                                                                        \
-            template <bool x>                                           \
-            struct call_c99 :                                           \
-                boost::hash_detail::call_##cpp_func<double> {};         \
-                                                                        \
-            template <>                                                 \
-            struct call_c99<true> {                                     \
-                typedef type1 float_type;                               \
-                                                                        \
-                template <typename T>                                   \
-                inline type1 operator()(type1 a, T b)  const            \
-                {                                                       \
-                    return c99_func(a, b);                              \
-                }                                                       \
-            };                                                          \
-                                                                        \
-            template <bool x>                                           \
-            struct call_cpp :                                           \
-                call_c99<                                               \
-                    ::boost::hash_detail::c99_func##_detect::check::c99 \
-                > {};                                                   \
-                                                                        \
-            template <>                                                 \
-            struct call_cpp<true> {                                     \
-                typedef type1 float_type;                               \
-                                                                        \
-                template <typename T>                                   \
-                inline type1 operator()(type1 a, T b)  const            \
-                {                                                       \
-                    return cpp_func(a, b);                              \
-                }                                                       \
             };                                                          \
         }                                                               \
                                                                         \
+        template <bool x>                                               \
+        struct call_c99_##c99_func :                                    \
+            boost::hash_detail::call_##cpp_func<double> {};             \
+                                                                        \
+        template <>                                                     \
+        struct call_c99_##c99_func<true> {                              \
+            typedef type1 float_type;                                   \
+                                                                        \
+            template <typename T>                                       \
+            inline type1 operator()(type1 a, T b)  const                \
+            {                                                           \
+                using namespace std;                                    \
+                return c99_func(a, b);                                  \
+            }                                                           \
+        };                                                              \
+                                                                        \
+        template <bool x>                                               \
+        struct call_cpp_##c99_func :                                    \
+            call_c99_##c99_func<                                        \
+                ::boost::hash_detail::c99_func##_detect::check::c99     \
+            > {};                                                       \
+                                                                        \
+        template <>                                                     \
+        struct call_cpp_##c99_func<true> {                              \
+            typedef type1 float_type;                                   \
+                                                                        \
+            template <typename T>                                       \
+            inline type1 operator()(type1 a, T b)  const                \
+            {                                                           \
+                using namespace std;                                    \
+                return cpp_func(a, b);                                  \
+            }                                                           \
+        };                                                              \
+                                                                        \
         template <>                                                     \
         struct call_##cpp_func<type1> :                                 \
-            c99_func##_detect::call_cpp<                                \
+            call_cpp_##c99_func<                                        \
                 ::boost::hash_detail::c99_func##_detect::check::cpp     \
             > {};                                                       \
     }                                                                   \
diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp
index d173314..3c587a3 100644
--- a/include/boost/functional/hash/extensions.hpp
+++ b/include/boost/functional/hash/extensions.hpp
@@ -7,15 +7,114 @@
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
 //  issue 6.18. 
 
+// This implements the extensions to the standard.
+// It's undocumented, so you shouldn't use it....
+
 #if !defined(BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP)
 #define BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP
 
+#include <boost/functional/hash/hash.hpp>
+#include <boost/detail/container_fwd.hpp>
+
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif
 
+#if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
+#include <boost/type_traits/is_array.hpp>
+#endif
+
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#include <boost/type_traits/is_const.hpp>
+#endif
+
 namespace boost
 {
+    template <class A, class B>
+    std::size_t hash_value(std::pair<A, B> const&);
+    template <class T, class A>
+    std::size_t hash_value(std::vector<T, A> const&);
+    template <class T, class A>
+    std::size_t hash_value(std::list<T, A> const& v);
+    template <class T, class A>
+    std::size_t hash_value(std::deque<T, A> const& v);
+    template <class K, class C, class A>
+    std::size_t hash_value(std::set<K, C, A> const& v);
+    template <class K, class C, class A>
+    std::size_t hash_value(std::multiset<K, C, A> const& v);
+    template <class K, class T, class C, class A>
+    std::size_t hash_value(std::map<K, T, C, A> const& v);
+    template <class K, class T, class C, class A>
+    std::size_t hash_value(std::multimap<K, T, C, A> const& v);
+
+    template <class T>
+    std::size_t hash_value(std::complex<T> const&);
+
+    template <class A, class B>
+    std::size_t hash_value(std::pair<A, B> const& v)
+    {
+        std::size_t seed = 0;
+        hash_combine(seed, v.first);
+        hash_combine(seed, v.second);
+        return seed;
+    }
+
+    template <class T, class A>
+    std::size_t hash_value(std::vector<T, A> const& v)
+    {
+        return hash_range(v.begin(), v.end());
+    }
+
+    template <class T, class A>
+    std::size_t hash_value(std::list<T, A> const& v)
+    {
+        return hash_range(v.begin(), v.end());
+    }
+
+    template <class T, class A>
+    std::size_t hash_value(std::deque<T, A> const& v)
+    {
+        return hash_range(v.begin(), v.end());
+    }
+
+    template <class K, class C, class A>
+    std::size_t hash_value(std::set<K, C, A> const& v)
+    {
+        return hash_range(v.begin(), v.end());
+    }
+
+    template <class K, class C, class A>
+    std::size_t hash_value(std::multiset<K, C, A> const& v)
+    {
+        return hash_range(v.begin(), v.end());
+    }
+
+    template <class K, class T, class C, class A>
+    std::size_t hash_value(std::map<K, T, C, A> const& v)
+    {
+        return hash_range(v.begin(), v.end());
+    }
+
+    template <class K, class T, class C, class A>
+    std::size_t hash_value(std::multimap<K, T, C, A> const& v)
+    {
+        return hash_range(v.begin(), v.end());
+    }
+
+    template <class T>
+    std::size_t hash_value(std::complex<T> const& v)
+    {
+        boost::hash<T> hasher;
+        std::size_t seed = hasher(v.imag());
+        seed ^= hasher(v.real()) + (seed<<6) + (seed>>2);
+        return seed;
+    }
+
+    //
+    // call_hash_impl
+    //
+
+    // On compilers without function template ordering, this deals with arrays.
 
 #if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
     namespace hash_detail
@@ -61,6 +160,11 @@ namespace boost
     }
 #endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 
+    //
+    // boost::hash
+    //
+
+
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 
     template <class T> struct hash
@@ -94,7 +198,7 @@ namespace boost
 
     // On compilers without partial specialization, boost::hash<T>
     // has already been declared to deal with pointers, so just
-    // need to supply the non-pointer version.
+    // need to supply the non-pointer version of hash_impl.
 
     namespace hash_detail
     {
@@ -126,8 +230,8 @@ namespace boost
 
 #else // Visual C++ 6.5
 
-    // There's probably a more elegant way to Visual C++ 6.5 to work
-    // but I don't know what it is.
+        // Visual C++ 6.5 has problems with nested member functions and
+        // applying const to const types in templates. So we get this:
 
         template <bool IsConst>
         struct hash_impl_msvc
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 12283ff..89196bc 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -13,7 +13,6 @@
 #include <boost/functional/hash/hash_fwd.hpp>
 #include <functional>
 #include <boost/functional/hash/detail/hash_float.hpp>
-#include <boost/detail/container_fwd.hpp>
 #include <string>
 #include <boost/limits.hpp>
 
@@ -21,12 +20,10 @@
 #include <boost/type_traits/is_pointer.hpp>
 #endif
 
-#if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-#include <boost/type_traits/is_array.hpp>
-#endif
-
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-#include <boost/type_traits/is_const.hpp>
+#if BOOST_WORKAROUND(__GNUC__, < 3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
+#define BOOST_HASH_CHAR_TRAITS string_char_traits
+#else
+#define BOOST_HASH_CHAR_TRAITS char_traits
 #endif
 
 namespace boost
@@ -72,26 +69,6 @@ namespace boost
     template <class Ch, class A>
     std::size_t hash_value(std::basic_string<Ch, std::BOOST_HASH_CHAR_TRAITS<Ch>, A> const&);
 
-    template <class A, class B>
-    std::size_t hash_value(std::pair<A, B> const&);
-    template <class T, class A>
-    std::size_t hash_value(std::vector<T, A> const&);
-    template <class T, class A>
-    std::size_t hash_value(std::list<T, A> const& v);
-    template <class T, class A>
-    std::size_t hash_value(std::deque<T, A> const& v);
-    template <class K, class C, class A>
-    std::size_t hash_value(std::set<K, C, A> const& v);
-    template <class K, class C, class A>
-    std::size_t hash_value(std::multiset<K, C, A> const& v);
-    template <class K, class T, class C, class A>
-    std::size_t hash_value(std::map<K, T, C, A> const& v);
-    template <class K, class T, class C, class A>
-    std::size_t hash_value(std::multimap<K, T, C, A> const& v);
-
-    template <class T>
-    std::size_t hash_value(std::complex<T> const&);
-
     // Implementation
 
     namespace hash_detail
@@ -315,69 +292,21 @@ namespace boost
         return boost::hash_detail::float_hash_value(v);
     }
 
-    template <class A, class B>
-    std::size_t hash_value(std::pair<A, B> const& v)
-    {
-        std::size_t seed = 0;
-        hash_combine(seed, v.first);
-        hash_combine(seed, v.second);
-        return seed;
-    }
-
-    template <class T, class A>
-    std::size_t hash_value(std::vector<T, A> const& v)
-    {
-        return hash_range(v.begin(), v.end());
-    }
-
-    template <class T, class A>
-    std::size_t hash_value(std::list<T, A> const& v)
-    {
-        return hash_range(v.begin(), v.end());
-    }
-
-    template <class T, class A>
-    std::size_t hash_value(std::deque<T, A> const& v)
-    {
-        return hash_range(v.begin(), v.end());
-    }
-
-    template <class K, class C, class A>
-    std::size_t hash_value(std::set<K, C, A> const& v)
-    {
-        return hash_range(v.begin(), v.end());
-    }
-
-    template <class K, class C, class A>
-    std::size_t hash_value(std::multiset<K, C, A> const& v)
-    {
-        return hash_range(v.begin(), v.end());
-    }
-
-    template <class K, class T, class C, class A>
-    std::size_t hash_value(std::map<K, T, C, A> const& v)
-    {
-        return hash_range(v.begin(), v.end());
-    }
-
-    template <class K, class T, class C, class A>
-    std::size_t hash_value(std::multimap<K, T, C, A> const& v)
-    {
-        return hash_range(v.begin(), v.end());
-    }
-
-    template <class T>
-    std::size_t hash_value(std::complex<T> const& v)
-    {
-        boost::hash<T> hasher;
-        std::size_t seed = hasher(v.imag());
-        seed ^= hasher(v.real()) + (seed<<6) + (seed>>2);
-        return seed;
-    }
-
     //
     // boost::hash
     //
+    
+    // Define the specializations required by the standard. The general purpose
+    // boost::hash is defined later in extensions.hpp if BOOST_HASH_NO_EXTENSIONS
+    // is not defined.
+    
+    // BOOST_HASH_SPECIALIZE - define a specialization for a type which is
+    // passed by copy.
+    //
+    // BOOST_HASH_SPECIALIZE_REF - define a specialization for a type which is
+    // passed by copy.
+    //
+    // These are undefined later.
 
 #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
 #define BOOST_HASH_SPECIALIZE(type) \
@@ -462,10 +391,18 @@ namespace boost
     BOOST_HASH_SPECIALIZE_REF(std::wstring)
 #endif
 
+#if defined(BOOST_HAS_LONG_LONG)
+    BOOST_HASH_SPECIALIZE(boost::long_long_type);
+    BOOST_HASH_SPECIALIZE(boost::ulong_long_type);
+#endif
+
 #undef BOOST_HASH_SPECIALIZE
 #undef BOOST_HASH_SPECIALIZE_REF
 
+// Specializing boost::hash for pointers.
+
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+
     template <class T>
     struct hash<T*>
         : public std::unary_function<T*, std::size_t>
@@ -482,7 +419,15 @@ namespace boost
 #endif
         }
     };
+
 #else
+
+    // For compilers without partial specialization, we define a
+    // boost::hash for all remaining types. But hash_impl is only defined
+    // for pointers in 'extensions.hpp' - so when BOOST_HASH_NO_EXTENSIONS
+    // is defined there will still be a compile error for types not supported
+    // in the standard.
+
     namespace hash_detail
     {
         template <bool IsPointer>
@@ -515,9 +460,12 @@ namespace boost
             ::BOOST_NESTED_TEMPLATE inner<T>
     {
     };
+
 #endif
 }
 
+#undef BOOST_HASH_CHAR_TRAITS
+
 #endif // BOOST_FUNCTIONAL_HASH_HASH_HPP
 
 // Include this outside of the include guards in case the file is included

From 3df2fba780c2e313a4043eaa268dfeb63403b415 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 9 Jul 2009 00:11:16 +0000
Subject: [PATCH 059/111] Fix gcc -pedantic warning: remove extra ";".

Merged revisions 54146 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r54146 | jhunold | 2009-06-21 15:38:19 +0100 (Sun, 21 Jun 2009) | 2 lines

  Fix gcc -pedantic warning: remove extra ";".
........


[SVN r54826]
---
 include/boost/functional/hash/hash.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 89196bc..6784f3e 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -392,8 +392,8 @@ namespace boost
 #endif
 
 #if defined(BOOST_HAS_LONG_LONG)
-    BOOST_HASH_SPECIALIZE(boost::long_long_type);
-    BOOST_HASH_SPECIALIZE(boost::ulong_long_type);
+    BOOST_HASH_SPECIALIZE(boost::long_long_type)
+    BOOST_HASH_SPECIALIZE(boost::ulong_long_type)
 #endif
 
 #undef BOOST_HASH_SPECIALIZE

From 6487301de71475bf4f3d6d736d3993b228a70e60 Mon Sep 17 00:00:00 2001
From: "Troy D. Straszheim" <troy@resophonic.com>
Date: Wed, 22 Jul 2009 21:51:01 +0000
Subject: [PATCH 060/111] Add basic copyright/license to keep cmake out of the
 inspection report

[SVN r55095]
---
 CMakeLists.txt               | 6 ++++++
 hash/doc/CMakeLists.txt      | 6 ++++++
 hash/examples/CMakeLists.txt | 6 ++++++
 hash/test/CMakeLists.txt     | 6 ++++++
 test/CMakeLists.txt          | 6 ++++++
 5 files changed, 30 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcd5130..6a28765 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,9 @@
+#
+# Copyright Troy D. Straszheim
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
 #----------------------------------------------------------------------------
 # This file was automatically generated from the original CMakeLists.txt file
 # Add a variable to hold the headers for the library
diff --git a/hash/doc/CMakeLists.txt b/hash/doc/CMakeLists.txt
index cd83029..f9e29c0 100644
--- a/hash/doc/CMakeLists.txt
+++ b/hash/doc/CMakeLists.txt
@@ -1,2 +1,8 @@
+#
+# Copyright Troy D. Straszheim
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
 message(STATUS "functional/hash docs need love")
 
diff --git a/hash/examples/CMakeLists.txt b/hash/examples/CMakeLists.txt
index 9a5efc8..347a9b2 100644
--- a/hash/examples/CMakeLists.txt
+++ b/hash/examples/CMakeLists.txt
@@ -1,3 +1,9 @@
+#
+# Copyright Troy D. Straszheim
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
 #-------------------------------------------------------------------------
 #-- Needed include directories for the tests
 boost_additional_test_dependencies(config BOOST_DEPENDS test)
diff --git a/hash/test/CMakeLists.txt b/hash/test/CMakeLists.txt
index 0eea9c0..ca45f5d 100644
--- a/hash/test/CMakeLists.txt
+++ b/hash/test/CMakeLists.txt
@@ -1,3 +1,9 @@
+#
+# Copyright Troy D. Straszheim
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
 #project hash-tests
 #    : requirements
 #        <toolset>gcc:<define>_GLIBCXX_DEBUG
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 79691c3..2bd7a7d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1 +1,7 @@
+#
+# Copyright Troy D. Straszheim
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
 boost_test_run(function_test function_test.cpp)

From 75da5b4735b60eb09f711980b87be047bc6ac654 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 10 Oct 2009 14:53:46 +0000
Subject: [PATCH 061/111] Merge some documentation changes and inspect fixes.

Merged revisions 55370,55729,56440,56570-56571,56603,56697-56699 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r55370 | danieljames | 2009-08-02 19:18:14 +0100 (Sun, 02 Aug 2009) | 1 line

  Pass through more elements in doxygen2boostbook. Refs #3309.
........
  r55729 | danieljames | 2009-08-23 11:07:25 +0100 (Sun, 23 Aug 2009) | 3 lines

  Add depencies on doxygen documentation to standalone documentation targets.

  This seems to be needed for building pdfs.
........
  r56440 | danieljames | 2009-09-27 20:11:39 +0100 (Sun, 27 Sep 2009) | 1 line

  Fix silly error in doxygen test file.
........
  r56570 | danieljames | 2009-10-04 11:37:36 +0100 (Sun, 04 Oct 2009) | 1 line

  Clean up some unordered TODOs.
........
  r56571 | danieljames | 2009-10-04 11:37:56 +0100 (Sun, 04 Oct 2009) | 1 line

  Detab.
........
  r56603 | danieljames | 2009-10-05 22:29:39 +0100 (Mon, 05 Oct 2009) | 1 line

  Various inspect fixes.
........
  r56697 | danieljames | 2009-10-10 14:00:28 +0100 (Sat, 10 Oct 2009) | 1 line

  Add forwarding html file for accumulators.
........
  r56698 | danieljames | 2009-10-10 14:01:14 +0100 (Sat, 10 Oct 2009) | 1 line

  Missing newline.
........
  r56699 | danieljames | 2009-10-10 14:01:30 +0100 (Sat, 10 Oct 2009) | 1 line

  Add copyright to boostbook reference xml.
........


[SVN r56702]
---
 hash/test/namespace_fail_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hash/test/namespace_fail_test.cpp b/hash/test/namespace_fail_test.cpp
index d3c13aa..711ddd0 100644
--- a/hash/test/namespace_fail_test.cpp
+++ b/hash/test/namespace_fail_test.cpp
@@ -11,4 +11,4 @@
 
 typedef list<int> foo;
 
-int main() {}
\ No newline at end of file
+int main() {}

From 1697609dce3bde24fc42bee459366fef5b619203 Mon Sep 17 00:00:00 2001
From: "Troy D. Straszheim" <troy@resophonic.com>
Date: Sat, 17 Oct 2009 01:10:45 +0000
Subject: [PATCH 062/111] rm cmake from the release branch before it goes out
 broken.  Policy dictates that you never commit to release, you commit to
 trunk and merge to release.

[SVN r56941]
---
 CMakeLists.txt               | 28 -----------------
 hash/doc/CMakeLists.txt      |  8 -----
 hash/examples/CMakeLists.txt | 15 ----------
 hash/test/CMakeLists.txt     | 58 ------------------------------------
 module.cmake                 |  1 -
 test/CMakeLists.txt          |  7 -----
 6 files changed, 117 deletions(-)
 delete mode 100644 CMakeLists.txt
 delete mode 100644 hash/doc/CMakeLists.txt
 delete mode 100644 hash/examples/CMakeLists.txt
 delete mode 100644 hash/test/CMakeLists.txt
 delete mode 100644 module.cmake
 delete mode 100644 test/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 6a28765..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    functional.hpp
-    functional
-)
-
-# Add a library target to the build system
-boost_library_project(
-  functional
-  #  SRCDIRS 
-  TESTDIRS  test hash/test hash/examples
-  HEADERS ${lib_headers}
-  DOCDIRS  hash/doc
-  #  DESCRIPTION 
-  MODULARIZED 
-  #  AUTHORS 
-  #  MAINTAINERS 
-)
-
-
diff --git a/hash/doc/CMakeLists.txt b/hash/doc/CMakeLists.txt
deleted file mode 100644
index f9e29c0..0000000
--- a/hash/doc/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-message(STATUS "functional/hash docs need love")
-
diff --git a/hash/examples/CMakeLists.txt b/hash/examples/CMakeLists.txt
deleted file mode 100644
index 347a9b2..0000000
--- a/hash/examples/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-#-------------------------------------------------------------------------
-#-- Needed include directories for the tests
-boost_additional_test_dependencies(config BOOST_DEPENDS test)
-#-------------------------------------------------------------------------
-boost_test_run(books)
-boost_test_run(point)
-boost_test_run(portable)
-
-
diff --git a/hash/test/CMakeLists.txt b/hash/test/CMakeLists.txt
deleted file mode 100644
index ca45f5d..0000000
--- a/hash/test/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-#project hash-tests
-#    : requirements
-#        <toolset>gcc:<define>_GLIBCXX_DEBUG
-#    ;
-if (GCC)
-  ADD_DEFINITIONS(-D_GLIBCXX_DEBUG)
-endif(GCC)
-
-#        [ run .cpp : : : <test-info>always_show_run_output ]
-
-
-
-#-------------------------------------------------------------------------
-#-- Needed include directories for the tests
-  boost_additional_test_dependencies(functional BOOST_DEPENDS test)
-#-------------------------------------------------------------------------
-
-SET(tests
-hash_fwd_test_1
-hash_fwd_test_2
-hash_number_test
-hash_pointer_test
-hash_function_pointer_test
-hash_float_test
-hash_long_double_test
-hash_string_test
-hash_range_test
-hash_custom_test
-hash_global_namespace_test
-hash_friend_test
-hash_built_in_array_test
-hash_value_array_test
-hash_vector_test
-hash_list_test
-hash_deque_test
-hash_set_test
-hash_map_test
-hash_complex_test
-container_fwd_test
-hash_no_ext_macro_1
-hash_no_ext_macro_2
-)
-
-boost_test_run(link_test link_test.cpp link_test_2.cpp)
-boost_test_run(link_ext_test link_ext_test.cpp link_no_ext_test.cpp
-)
-foreach(test ${tests})
-  boost_test_run(${test})
-endforeach(test ${tests})
-
-boost_test_compile_fail(hash_no_ext_fail_test)
-
diff --git a/module.cmake b/module.cmake
deleted file mode 100644
index f10d82e..0000000
--- a/module.cmake
+++ /dev/null
@@ -1 +0,0 @@
-boost_module(functional DEPENDS integer)
\ No newline at end of file
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
deleted file mode 100644
index 2bd7a7d..0000000
--- a/test/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-boost_test_run(function_test function_test.cpp)

From 19007717dcd1c87e6807de653dfc3c633915f820 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 29 Nov 2009 16:14:10 +0000
Subject: [PATCH 063/111] Merge hash warning fixes from trunk.

[SVN r58032]
---
 hash/examples/books.cpp                  |  1 +
 hash/test/Jamfile.v2                     | 11 +++++++--
 hash/test/config.hpp                     |  6 +++++
 hash/test/container_fwd_test.cpp         |  2 ++
 hash/test/extensions_hpp_test.cpp        |  2 ++
 hash/test/hash_complex_test.cpp          | 29 ++++++++++++++----------
 hash/test/hash_custom_test.cpp           |  1 +
 hash/test/hash_float_test.hpp            |  4 ++++
 hash/test/hash_friend_test.cpp           |  2 ++
 hash/test/hash_fwd_test_1.cpp            |  2 ++
 hash/test/hash_fwd_test_2.cpp            |  2 ++
 hash/test/hash_global_namespace_test.cpp |  2 ++
 hash/test/hash_no_ext_fail_test.cpp      | 17 ++++++++++----
 hash/test/hash_no_ext_macro_1.cpp        | 20 +++++++++-------
 hash/test/hash_no_ext_macro_2.cpp        | 19 ++++++++++------
 hash/test/link_ext_test.cpp              |  2 ++
 hash/test/link_no_ext_test.cpp           |  2 ++
 hash/test/link_test.cpp                  |  2 ++
 hash/test/link_test_2.cpp                |  2 ++
 hash/test/namespace_fail_test.cpp        |  2 ++
 include/boost/functional/hash/hash.hpp   | 13 +++++++++++
 21 files changed, 110 insertions(+), 33 deletions(-)

diff --git a/hash/examples/books.cpp b/hash/examples/books.cpp
index d54b353..40feae3 100644
--- a/hash/examples/books.cpp
+++ b/hash/examples/books.cpp
@@ -20,6 +20,7 @@ int main()
 
     boost::hash<library::book> book_hasher;
     std::size_t knife_hash_value = book_hasher(knife);
+    (void)knife_hash_value; // suppress unused variable warning
 
     // If std::unordered_set was available:
     //
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index ea19365..bff1622 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -7,9 +7,16 @@ import testing ;
 
 project hash-tests
     : requirements
+        <warnings>all
+        <toolset>intel:<warnings>on
+        <toolset>intel:<cxxflags>-strict-ansi
+        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
+        <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>gcc:<define>_GLIBCXX_DEBUG
-        <toolset>gcc:<cxxflags>-Wsign-promo
-        #<toolset>gcc:<cxxflags>-Wextra
+        <toolset>darwin:<define>_GLIBCXX_DEBUG
+        <toolset>msvc:<warnings-as-errors>on
+        <toolset>gcc:<warnings-as-errors>on
+        <toolset>darwin:<warnings-as-errors>on
     ;
 
 test-suite functional/hash
diff --git a/hash/test/config.hpp b/hash/test/config.hpp
index 1fd0f5f..893f456 100644
--- a/hash/test/config.hpp
+++ b/hash/test/config.hpp
@@ -12,3 +12,9 @@
 #    define TEST_EXTENSIONS
 #  endif
 #endif
+
+#if defined(_WIN32_WCE)
+// The standard windows mobile headers trigger this warning so I disable it
+// before doing anything else.
+#pragma warning(disable:4201) // nonstandard extension used : nameless struct/union
+#endif
diff --git a/hash/test/container_fwd_test.cpp b/hash/test/container_fwd_test.cpp
index 87f5b90..a63c086 100644
--- a/hash/test/container_fwd_test.cpp
+++ b/hash/test/container_fwd_test.cpp
@@ -3,6 +3,8 @@
 // Distributed under 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)
 
+#include "./config.hpp"
+
 #include <boost/functional/detail/container_fwd.hpp>
 
 #if BOOST_WORKAROUND(__GNUC__, < 3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
diff --git a/hash/test/extensions_hpp_test.cpp b/hash/test/extensions_hpp_test.cpp
index 182ec01..c27981a 100644
--- a/hash/test/extensions_hpp_test.cpp
+++ b/hash/test/extensions_hpp_test.cpp
@@ -8,6 +8,8 @@
 // It probably should be in boost/functional/hash/detail, but since it isn't it
 // should work.
 
+#include "./config.hpp"
+
 #include <boost/functional/hash/extensions.hpp>
 
 int main() {
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
index f791391..3d7c200 100644
--- a/hash/test/hash_complex_test.cpp
+++ b/hash/test/hash_complex_test.cpp
@@ -19,20 +19,21 @@ int main() {}
 
 #include <boost/detail/lightweight_test.hpp>
 
+#if defined(BOOST_MSVC)
+#pragma warning(disable:4244) // conversion from 'unsigned long' to 'unsigned short', possible loss of data
+#pragma warning(disable:4245) // conversion from 'int' to  'const unsigned short', signed/unsigned mismatch
+#pragma warning(disable:4305) // truncation from 'double' to 'const std::complex<float>::_Ty'
+#pragma warning(disable:4309) // truncation of constant value
+#pragma warning(disable:4512) // assignment operator could not be generated
+#if BOOST_MSVC < 1400
+#pragma warning(disable:4267) // conversion from 'size_t' to 'unsigned int', possible loss of data
+#endif
+#endif
+
 #include <complex>
 #include <sstream>
 #include <boost/limits.hpp>
 
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-#pragma warning(disable:4244) // conversion from 'unsigned long' to 'unsigned short', possible loss of data
-#pragma warning(disable:4512) // assignment operator could not be generated
-#endif
-
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
-
 template <class T>
 void generic_complex_tests(std::complex<T> v)
 {
@@ -80,13 +81,17 @@ void complex_integral_tests(Integer*)
 
 int main()
 {
+    // I've comments out the short and unsigned short tests
+    // as they cause warnings and don't really test
+    // anything that the other tests already deal with.
+
     complex_float_tests((float*) 0);
     complex_float_tests((double*) 0);
     complex_float_tests((long double*) 0);
-    complex_integral_tests((short*) 0);
+    //complex_integral_tests((short*) 0);
     complex_integral_tests((int*) 0);
     complex_integral_tests((long*) 0);
-    complex_integral_tests((unsigned short*) 0);
+    //complex_integral_tests((unsigned short*) 0);
     complex_integral_tests((unsigned int*) 0);
     complex_integral_tests((unsigned long*) 0);
 
diff --git a/hash/test/hash_custom_test.cpp b/hash/test/hash_custom_test.cpp
index 9943d0c..fb37d91 100644
--- a/hash/test/hash_custom_test.cpp
+++ b/hash/test/hash_custom_test.cpp
@@ -3,6 +3,7 @@
 // Distributed under 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)
 
+#include "./config.hpp"
 #include <boost/config.hpp>
 #include <cstddef>
 
diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
index b1c19fc..ab3cbf2 100644
--- a/hash/test/hash_float_test.hpp
+++ b/hash/test/hash_float_test.hpp
@@ -23,6 +23,10 @@
 #if defined(BOOST_MSVC)
 #pragma warning(push)
 #pragma warning(disable:4127) // conditional expression is constant
+#pragma warning(disable:4723) // conditional expression is constant
+#if BOOST_MSVC < 1400
+#pragma warning(disable:4267) // conversion from 'size_t' to 'unsigned int', possible loss of data
+#endif
 #endif
 
 char const* float_type(float*) { return "float"; }
diff --git a/hash/test/hash_friend_test.cpp b/hash/test/hash_friend_test.cpp
index cac4c7f..8a493e2 100644
--- a/hash/test/hash_friend_test.cpp
+++ b/hash/test/hash_friend_test.cpp
@@ -3,6 +3,8 @@
 // Distributed under 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)
 
+#include "./config.hpp"
+
 #include <boost/config.hpp>
 #include <cstddef>
 
diff --git a/hash/test/hash_fwd_test_1.cpp b/hash/test/hash_fwd_test_1.cpp
index e9a1cd8..6c7f8d3 100644
--- a/hash/test/hash_fwd_test_1.cpp
+++ b/hash/test/hash_fwd_test_1.cpp
@@ -5,6 +5,8 @@
 
 // This checks that template code implemented using hash_fwd will work.
 
+#include "./config.hpp"
+
 #include "./hash_fwd_test.hpp"
 
 #include <boost/detail/lightweight_test.hpp>
diff --git a/hash/test/hash_fwd_test_2.cpp b/hash/test/hash_fwd_test_2.cpp
index cf6e163..869f67b 100644
--- a/hash/test/hash_fwd_test_2.cpp
+++ b/hash/test/hash_fwd_test_2.cpp
@@ -6,6 +6,8 @@
 // This test just makes sure a header which uses hash_fwd can compile without
 // the main hash headers.
 
+#include "./config.hpp"
+
 #if !defined(TEST_EXTENSIONS) || defined(TEST_STD_INCLUDES)
 
 int main() {}
diff --git a/hash/test/hash_global_namespace_test.cpp b/hash/test/hash_global_namespace_test.cpp
index a45278c..ccb99e7 100644
--- a/hash/test/hash_global_namespace_test.cpp
+++ b/hash/test/hash_global_namespace_test.cpp
@@ -6,6 +6,8 @@
 // This test demonstrates an ADL bug in Borland 5.5 where ADL isn't performed
 // in the global namespace.
 
+#include "./config.hpp"
+
 #include <boost/config.hpp>
 #include <cstddef>
 
diff --git a/hash/test/hash_no_ext_fail_test.cpp b/hash/test/hash_no_ext_fail_test.cpp
index ef7ae96..22f6f5a 100644
--- a/hash/test/hash_no_ext_fail_test.cpp
+++ b/hash/test/hash_no_ext_fail_test.cpp
@@ -3,17 +3,26 @@
 // Distributed under 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)
 
-#define HASH_NAMESPACE boost
+#include "./config.hpp"
 
 // Simple test to make sure BOOST_HASH_NO_EXTENSIONS does disable extensions
 // (or at least one of them).
-#define BOOST_HASH_NO_EXTENSIONS
+#if !defined(BOOST_HASH_NO_EXTENSIONS)
+#  define BOOST_HASH_NO_EXTENSIONS
+#endif
 
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash.hpp>
+#ifdef TEST_STD_INCLUDES
+#  include <functional>
+#else
+#  include <boost/functional/hash.hpp>
+#endif
+
+template <class T> void ignore(T const&) {}
 
 int main()
 {
     HASH_NAMESPACE::hash< int[10] > hasher;
+    ignore(hasher);
+
     return 0;
 }
diff --git a/hash/test/hash_no_ext_macro_1.cpp b/hash/test/hash_no_ext_macro_1.cpp
index 1d238c0..ea727bb 100644
--- a/hash/test/hash_no_ext_macro_1.cpp
+++ b/hash/test/hash_no_ext_macro_1.cpp
@@ -3,24 +3,27 @@
 // Distributed under 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)
 
-#define HASH_NAMESPACE boost
+#include "./config.hpp"
+
+#if defined(TEST_EXTENSIONS)
 
 // Include header without BOOST_HASH_NO_EXTENSIONS defined
-#if defined(BOOST_HASH_NO_EXTENSIONS)
-#undef BOOST_HASH_NO_EXTENSIONS
-#endif
-#include <boost/functional/hash.hpp>
+#  if defined(BOOST_HASH_NO_EXTENSIONS)
+#    undef BOOST_HASH_NO_EXTENSIONS
+#  endif
+#  include <boost/functional/hash.hpp>
 
 // Include header with BOOST_HASH_NO_EXTENSIONS defined
-#define BOOST_HASH_NO_EXTENSIONS
-#include <boost/functional/hash.hpp>
+#  define BOOST_HASH_NO_EXTENSIONS
+#  include <boost/functional/hash.hpp>
+#endif
 
 #include <boost/detail/lightweight_test.hpp>
 #include <deque>
-#include <cassert>
 
 int main()
 {
+#if defined(TEST_EXTENSIONS)
     std::deque<int> x;
 
     x.push_back(1);
@@ -28,6 +31,7 @@ int main()
 
     HASH_NAMESPACE::hash<std::deque<int> > hasher;
     BOOST_TEST(hasher(x) == HASH_NAMESPACE::hash_value(x));
+#endif
 
     return boost::report_errors();
 }
diff --git a/hash/test/hash_no_ext_macro_2.cpp b/hash/test/hash_no_ext_macro_2.cpp
index 6ab083e..a8d8c65 100644
--- a/hash/test/hash_no_ext_macro_2.cpp
+++ b/hash/test/hash_no_ext_macro_2.cpp
@@ -3,23 +3,27 @@
 // Distributed under 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)
 
-#define HASH_NAMESPACE boost
+#include "./config.hpp"
+
+#if defined(TEST_EXTENSIONS)
 
 // Include header with BOOST_HASH_NO_EXTENSIONS defined
-#if !defined(BOOST_HASH_NO_EXTENSIONS)
-#define BOOST_HASH_NO_EXTENSIONS
-#endif
-#include <boost/functional/hash.hpp>
+#  if !defined(BOOST_HASH_NO_EXTENSIONS)
+#    define BOOST_HASH_NO_EXTENSIONS
+#  endif
+#  include <boost/functional/hash.hpp>
 
 // Include header without BOOST_HASH_NO_EXTENSIONS defined
-#undef BOOST_HASH_NO_EXTENSIONS
-#include <boost/functional/hash.hpp>
+#  undef BOOST_HASH_NO_EXTENSIONS
+#  include <boost/functional/hash.hpp>
+#endif
 
 #include <boost/detail/lightweight_test.hpp>
 #include <map>
 
 int main()
 {
+#if defined(TEST_EXTENSIONS)
     std::map<int, int> x;
 
     x.insert(std::map<int, int>::value_type(53, -42));
@@ -27,6 +31,7 @@ int main()
 
     HASH_NAMESPACE::hash<std::map<int, int> > hasher;
     BOOST_TEST(hasher(x) == HASH_NAMESPACE::hash_value(x));
+#endif
     
     return boost::report_errors();
 }
diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp
index d334035..c0e224c 100644
--- a/hash/test/link_ext_test.cpp
+++ b/hash/test/link_ext_test.cpp
@@ -3,6 +3,8 @@
 // Distributed under 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)
 
+#include "./config.hpp"
+
 #define HASH_NAMESPACE boost
 #include <boost/functional/hash.hpp>
 #include <boost/detail/lightweight_test.hpp>
diff --git a/hash/test/link_no_ext_test.cpp b/hash/test/link_no_ext_test.cpp
index 7f46984..c2e6869 100644
--- a/hash/test/link_no_ext_test.cpp
+++ b/hash/test/link_no_ext_test.cpp
@@ -3,6 +3,8 @@
 // Distributed under 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)
 
+#include "./config.hpp"
+
 #define HASH_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
diff --git a/hash/test/link_test.cpp b/hash/test/link_test.cpp
index 37f9ee1..bdae262 100644
--- a/hash/test/link_test.cpp
+++ b/hash/test/link_test.cpp
@@ -3,6 +3,8 @@
 // Distributed under 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)
 
+#include "./config.hpp"
+
 #include <boost/functional/hash.hpp>
 
 extern int f();
diff --git a/hash/test/link_test_2.cpp b/hash/test/link_test_2.cpp
index f32065c..1beffc8 100644
--- a/hash/test/link_test_2.cpp
+++ b/hash/test/link_test_2.cpp
@@ -3,6 +3,8 @@
 // Distributed under 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)
 
+#include "./config.hpp"
+
 #include <boost/functional/hash.hpp>
 
 int f() { return 0; }
diff --git a/hash/test/namespace_fail_test.cpp b/hash/test/namespace_fail_test.cpp
index 711ddd0..1db9fc6 100644
--- a/hash/test/namespace_fail_test.cpp
+++ b/hash/test/namespace_fail_test.cpp
@@ -6,6 +6,8 @@
 // Check that I haven't inadvertantly pulled namespace std into the global
 // namespace.
 
+#include "./config.hpp"
+
 #include <list>
 #include <boost/functional/hash.hpp>
 
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 6784f3e..697cb41 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -197,6 +197,15 @@ namespace boost
         return x + (x >> 3);
     }
 
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#if BOOST_MSVC <= 1400
+#pragma warning(disable:4267) // 'argument' : conversion from 'size_t' to 'unsigned int',
+                              // possible loss of data
+                              // A misguided attempt to detect 64-bit incompatability.
+#endif
+#endif
+
 #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
     template <class T>
     inline void hash_combine(std::size_t& seed, T& v)
@@ -209,6 +218,10 @@ namespace boost
         seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
     }
 
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
     template <class It>
     inline std::size_t hash_range(It first, It last)
     {

From 55e7d127af34a61fc59ed55ca7d3dc60da80b088 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 7 Dec 2009 19:26:26 +0000
Subject: [PATCH 064/111] Merge unordered and hash.

Improved Codegear support in unordered.
Another warning suppression in hash.


[SVN r58223]
---
 hash/test/hash_map_test.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp
index 3b52a50..6e85dcf 100644
--- a/hash/test/hash_map_test.hpp
+++ b/hash/test/hash_map_test.hpp
@@ -11,6 +11,7 @@
 
 #if defined(BOOST_MSVC)
 #pragma warning(push)
+#pragma warning(disable:4244) // conversion from 'int' to 'float'
 #pragma warning(disable:4245) // signed/unsigned mismatch
 #endif
 

From c3f67731874640498f661754d8364d480c1a1697 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Fri, 8 Jan 2010 05:38:39 +0000
Subject: [PATCH 065/111] Merge hash changes.

[SVN r58801]
---
 hash/test/Jamfile.v2                          |  10 +-
 hash/test/config.hpp                          |   3 +-
 hash/test/container_fwd_test.cpp              |   9 +-
 hash/test/hash_complex_test.cpp               |  17 ++-
 hash/test/hash_custom_test.cpp                |   4 +-
 hash/test/hash_float_test.hpp                 | 121 ++++++++++++------
 hash/test/hash_friend_test.cpp                |   4 +-
 hash/test/hash_fwd_test.hpp                   |   6 +-
 hash/test/hash_fwd_test_1.cpp                 |   7 +-
 hash/test/hash_global_namespace_test.cpp      |   4 +-
 hash/test/hash_map_test.hpp                   |  18 +--
 hash/test/hash_number_test.cpp                |   5 +-
 hash/test/hash_range_test.cpp                 |   6 +-
 .../hash/detail/float_functions.hpp           |   6 +-
 include/boost/functional/hash/hash.hpp        |  20 +--
 15 files changed, 154 insertions(+), 86 deletions(-)

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index bff1622..21594ee 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -12,11 +12,9 @@ project hash-tests
         <toolset>intel:<cxxflags>-strict-ansi
         <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
-        <toolset>gcc:<define>_GLIBCXX_DEBUG
-        <toolset>darwin:<define>_GLIBCXX_DEBUG
         <toolset>msvc:<warnings-as-errors>on
-        <toolset>gcc:<warnings-as-errors>on
-        <toolset>darwin:<warnings-as-errors>on
+        #<toolset>gcc:<warnings-as-errors>on
+        #<toolset>darwin:<warnings-as-errors>on
     ;
 
 test-suite functional/hash
@@ -45,6 +43,10 @@ test-suite functional/hash
         [ run link_ext_test.cpp link_no_ext_test.cpp ]
         [ run extensions_hpp_test.cpp ]
         [ run container_fwd_test.cpp ]
+        [ run container_fwd_test.cpp : :
+            :   <toolset>gcc:<define>_GLIBCXX_DEBUG
+                <toolset>darwin:<define>_GLIBCXX_DEBUG
+            :   container_fwd_gcc_debug ]
         [ compile-fail hash_no_ext_fail_test.cpp ]
         [ compile-fail namespace_fail_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
diff --git a/hash/test/config.hpp b/hash/test/config.hpp
index 893f456..216d9c4 100644
--- a/hash/test/config.hpp
+++ b/hash/test/config.hpp
@@ -16,5 +16,6 @@
 #if defined(_WIN32_WCE)
 // The standard windows mobile headers trigger this warning so I disable it
 // before doing anything else.
-#pragma warning(disable:4201) // nonstandard extension used : nameless struct/union
+#pragma warning(disable:4201)   // nonstandard extension used :
+                                // nameless struct/union
 #endif
diff --git a/hash/test/container_fwd_test.cpp b/hash/test/container_fwd_test.cpp
index a63c086..ec8cc54 100644
--- a/hash/test/container_fwd_test.cpp
+++ b/hash/test/container_fwd_test.cpp
@@ -7,14 +7,17 @@
 
 #include <boost/functional/detail/container_fwd.hpp>
 
-#if BOOST_WORKAROUND(__GNUC__, < 3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
+#if BOOST_WORKAROUND(__GNUC__, < 3) && \
+    !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
 template <class charT, class Allocator>
-static void test(std::basic_string<charT, std::string_char_traits<charT>, Allocator> const&)
+static void test(
+    std::basic_string<charT, std::string_char_traits<charT>, Allocator> const&)
 {
 }
 #else
 template <class charT, class Allocator>
-static void test(std::basic_string<charT, std::char_traits<charT>, Allocator> const&)
+static void test(
+    std::basic_string<charT, std::char_traits<charT>, Allocator> const&)
 {
 }
 #endif
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
index 3d7c200..a2a2dc2 100644
--- a/hash/test/hash_complex_test.cpp
+++ b/hash/test/hash_complex_test.cpp
@@ -20,13 +20,18 @@ int main() {}
 #include <boost/detail/lightweight_test.hpp>
 
 #if defined(BOOST_MSVC)
-#pragma warning(disable:4244) // conversion from 'unsigned long' to 'unsigned short', possible loss of data
-#pragma warning(disable:4245) // conversion from 'int' to  'const unsigned short', signed/unsigned mismatch
-#pragma warning(disable:4305) // truncation from 'double' to 'const std::complex<float>::_Ty'
-#pragma warning(disable:4309) // truncation of constant value
-#pragma warning(disable:4512) // assignment operator could not be generated
+#pragma warning(disable:4244)   // conversion from 'unsigned long' to
+                                // 'unsigned short', possible loss of data
+#pragma warning(disable:4245)   // conversion from 'int' to
+                                // 'const unsigned short',
+                                // signed/unsigned mismatch
+#pragma warning(disable:4305)   // truncation from 'double' to
+                                // 'const std::complex<float>::_Ty'
+#pragma warning(disable:4309)   // truncation of constant value
+#pragma warning(disable:4512)   // assignment operator could not be generated
 #if BOOST_MSVC < 1400
-#pragma warning(disable:4267) // conversion from 'size_t' to 'unsigned int', possible loss of data
+#pragma warning(disable:4267)   // conversion from 'size_t' to 'unsigned int',
+                                // possible loss of data
 #endif
 #endif
 
diff --git a/hash/test/hash_custom_test.cpp b/hash/test/hash_custom_test.cpp
index fb37d91..966df09 100644
--- a/hash/test/hash_custom_test.cpp
+++ b/hash/test/hash_custom_test.cpp
@@ -84,8 +84,8 @@ void custom_tests()
     HASH_NAMESPACE::hash_combine(seed2, 250u);
     HASH_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_TEST(seed ==
-            HASH_NAMESPACE::hash_range(custom_vector.begin(), custom_vector.end()));
+    BOOST_TEST(seed == HASH_NAMESPACE::hash_range(
+        custom_vector.begin(), custom_vector.end()));
     BOOST_TEST(seed == seed2);
 }
 
diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
index ab3cbf2..2818bb2 100644
--- a/hash/test/hash_float_test.hpp
+++ b/hash/test/hash_float_test.hpp
@@ -22,10 +22,11 @@
 
 #if defined(BOOST_MSVC)
 #pragma warning(push)
-#pragma warning(disable:4127) // conditional expression is constant
-#pragma warning(disable:4723) // conditional expression is constant
+#pragma warning(disable:4127)   // conditional expression is constant
+#pragma warning(disable:4723)   // conditional expression is constant
 #if BOOST_MSVC < 1400
-#pragma warning(disable:4267) // conversion from 'size_t' to 'unsigned int', possible loss of data
+#pragma warning(disable:4267)   // conversion from 'size_t' to 'unsigned int',
+                                // possible loss of data
 #endif
 #endif
 
@@ -36,23 +37,33 @@ char const* float_type(long double*) { return "long double"; }
 template <class T>
 void float_tests(char const* name, T* = 0)
 {
-    std::cerr<<"\n"
-        <<"Testing " BOOST_STRINGIZE(HASH_NAMESPACE) "::hash<"<<name<<">\n"
-        <<"\n"
-        <<"boost::hash_detail::limits<T>::digits = "
-            <<boost::hash_detail::limits<T>::digits<<"\n"
-        <<"boost::hash_detail::limits<int>::digits = "
-            <<boost::hash_detail::limits<int>::digits<<"\n"
-        <<"boost::hash_detail::limits<std::size_t>::digits = "
-            <<boost::hash_detail::limits<std::size_t>::digits<<"\n"
-        <<"\n"
-        <<"boost::hash_detail::call_ldexp<T>::float_type = "
-            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_ldexp<T>::float_type*)0)<<"\n"
-        <<"boost::hash_detail::call_frexp<T>::float_type = "
-            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_frexp<T>::float_type*)0)<<"\n"
-        <<"boost::hash_detail::select_hash_type<T>::type = "
-            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::select_hash_type<T>::type*)0)<<"\n"
-        <<"\n"
+    std::cerr
+        <<  "\n"
+        <<  "Testing " BOOST_STRINGIZE(HASH_NAMESPACE) "::hash<"
+        <<  name
+        <<  ">\n"
+        <<  "\n"
+        <<  "boost::hash_detail::limits<T>::digits = "
+        <<  boost::hash_detail::limits<T>::digits<< "\n"
+        <<  "boost::hash_detail::limits<int>::digits = "
+        <<  boost::hash_detail::limits<int>::digits<< "\n"
+        <<  "boost::hash_detail::limits<std::size_t>::digits = "
+        <<  boost::hash_detail::limits<std::size_t>::digits
+        <<  "\n"
+        <<  "\n"
+        <<  "boost::hash_detail::call_ldexp<T>::float_type = "
+        <<  float_type(static_cast<BOOST_DEDUCED_TYPENAME
+                boost::hash_detail::call_ldexp<T>::float_type*>(0))
+        <<  "\n"
+        <<  "boost::hash_detail::call_frexp<T>::float_type = "
+        <<  float_type(static_cast<BOOST_DEDUCED_TYPENAME
+                boost::hash_detail::call_frexp<T>::float_type*>(0))
+        <<  "\n"
+        <<  "boost::hash_detail::select_hash_type<T>::type = "
+        <<  float_type(static_cast<BOOST_DEDUCED_TYPENAME
+                boost::hash_detail::select_hash_type<T>::type*>(0))
+        <<  "\n"
+        <<  "\n"
         ;
 
     HASH_NAMESPACE::hash<T> x1;
@@ -72,7 +83,9 @@ void float_tests(char const* name, T* = 0)
 
 // Doing anything with infinity causes borland to crash.
 #if defined(__BORLANDC__)
-    std::cerr<<"Not running infinity checks on Borland, as it causes it to crash.\n";
+    std::cerr
+        <<  "Not running infinity checks on Borland, as it causes it to crash."
+            "\n";
 #else
     if(boost::hash_detail::limits<T>::has_infinity) {
         T infinity = -log(zero);
@@ -111,19 +124,40 @@ void float_tests(char const* name, T* = 0)
         // This should really be 'has_denorm == denorm_present' but some
         // compilers don't have 'denorm_present'. See also a later use.
         if(boost::hash_detail::limits<T>::has_denorm) {
-            if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(infinity)) {
-                std::cerr<<"x1(denorm_min) == x1(infinity) == "<<x1(infinity)<<"\n";
+            if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(infinity))
+            {
+                std::cerr
+                    <<  "x1(denorm_min) == x1(infinity) == "
+                    <<  x1(infinity)
+                    <<  "\n";
             }
-            if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(minus_infinity)) {
-                std::cerr<<"x1(denorm_min) == x1(-infinity) == "<<x1(minus_infinity)<<"\n";
+
+            if(x1(boost::hash_detail::limits<T>::denorm_min()) ==
+                x1(minus_infinity))
+            {
+                std::cerr
+                    <<  "x1(denorm_min) == x1(-infinity) == "
+                    <<  x1(minus_infinity)
+                    <<  "\n";
             }
         }
+
         if(boost::hash_detail::limits<T>::has_quiet_NaN) {
-            if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(infinity)) {
-                std::cerr<<"x1(quiet_NaN) == x1(infinity) == "<<x1(infinity)<<"\n";
+            if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(infinity))
+            {
+                std::cerr
+                    <<  "x1(quiet_NaN) == x1(infinity) == "
+                    <<  x1(infinity)
+                    <<  "\n";
             }
-            if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(minus_infinity)) {
-                std::cerr<<"x1(quiet_NaN) == x1(-infinity) == "<<x1(minus_infinity)<<"\n";
+
+            if(x1(boost::hash_detail::limits<T>::quiet_NaN()) ==
+                x1(minus_infinity))
+            {
+                std::cerr
+                    <<  "x1(quiet_NaN) == x1(-infinity) == "
+                    <<  x1(minus_infinity)
+                    <<  "\n";
             }
         }
     }
@@ -146,10 +180,12 @@ void float_tests(char const* name, T* = 0)
     BOOST_TEST(x1(max) == HASH_NAMESPACE::hash_value(max));
     BOOST_TEST(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
     BOOST_TEST(x1(quarter_max) == HASH_NAMESPACE::hash_value(quarter_max));
-    BOOST_TEST(x1(three_quarter_max) == HASH_NAMESPACE::hash_value(three_quarter_max));
+    BOOST_TEST(x1(three_quarter_max) ==
+        HASH_NAMESPACE::hash_value(three_quarter_max));
 #endif
 
-    // The '!=' tests could legitimately fail, but with my hash it indicates a bug.
+    // The '!=' tests could legitimately fail, but with my hash it indicates a
+    // bug.
     BOOST_TEST(x1(max) == x1(max));
     BOOST_TEST(x1(max) != x1(quarter_max));
     BOOST_TEST(x1(max) != x1(half_max));
@@ -179,7 +215,8 @@ void float_tests(char const* name, T* = 0)
 
 #if defined(TEST_EXTENSIONS)
     BOOST_TEST(x1(boost::hash_detail::limits<T>::epsilon()) ==
-            HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::epsilon()));
+            HASH_NAMESPACE::hash_value(
+                boost::hash_detail::limits<T>::epsilon()));
 #endif
 
     BOOST_TEST(boost::hash_detail::limits<T>::epsilon() != (T) 0);
@@ -216,14 +253,19 @@ void float_tests(char const* name, T* = 0)
         // specialization of boost::hash_detail::limits::denorm_min() for long
         // doubles which causes this test to fail.
         if(x1(boost::hash_detail::limits<T>::denorm_min()) !=
-            HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::denorm_min()))
+            HASH_NAMESPACE::hash_value(
+                boost::hash_detail::limits<T>::denorm_min()))
         {
-            std::cerr<<"x1(boost::hash_detail::limits<T>::denorm_min()) = "
-                << x1(boost::hash_detail::limits<T>::denorm_min())
-                << "\nhash_value(boost::hash_detail::limits<T>::denorm_min()) = "
-                << HASH_NAMESPACE::hash_value(
+            std::cerr
+                <<  "x1(boost::hash_detail::limits<T>::denorm_min()) = "
+                <<  x1(boost::hash_detail::limits<T>::denorm_min())
+                <<  "\nhash_value(boost::hash_detail::limits<T>::denorm_min())"
+                    " = "
+                <<  HASH_NAMESPACE::hash_value(
                         boost::hash_detail::limits<T>::denorm_min())
-                << "\nx1(0) = "<<x1(0)<<"\n";
+                <<  "\nx1(0) = "
+                <<  x1(0)
+                <<  "\n";
         }
 #endif
     }
@@ -235,7 +277,8 @@ void float_tests(char const* name, T* = 0)
             std::cerr<<"x1(quiet_NaN) == x1(1.0) == "<<x1(1.0)<<"\n";
         }
         BOOST_TEST(x1(boost::hash_detail::limits<T>::quiet_NaN()) ==
-            HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::quiet_NaN()));
+            HASH_NAMESPACE::hash_value(
+                boost::hash_detail::limits<T>::quiet_NaN()));
     }
 #endif
 }
diff --git a/hash/test/hash_friend_test.cpp b/hash/test/hash_friend_test.cpp
index 8a493e2..9d84570 100644
--- a/hash/test/hash_friend_test.cpp
+++ b/hash/test/hash_friend_test.cpp
@@ -87,8 +87,8 @@ void custom_tests()
     HASH_NAMESPACE::hash_combine(seed2, 250u);
     HASH_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_TEST(seed ==
-            HASH_NAMESPACE::hash_range(custom_vector.begin(), custom_vector.end()));
+    BOOST_TEST(seed == HASH_NAMESPACE::hash_range(
+        custom_vector.begin(), custom_vector.end()));
     BOOST_TEST(seed == seed2);
 }
 
diff --git a/hash/test/hash_fwd_test.hpp b/hash/test/hash_fwd_test.hpp
index 2438abf..09ef3b3 100644
--- a/hash/test/hash_fwd_test.hpp
+++ b/hash/test/hash_fwd_test.hpp
@@ -60,7 +60,8 @@ namespace test {
     template <class T>
     std::size_t hash_value(test_type3<T> const& x)
     {
-        std::size_t seed = HASH_NAMESPACE::hash_range(x.values.begin(), x.values.end());
+        std::size_t seed =
+            HASH_NAMESPACE::hash_range(x.values.begin(), x.values.end());
         HASH_NAMESPACE::hash_range(seed, x.values.begin(), x.values.end());
         return seed;
     }
@@ -91,7 +92,8 @@ namespace boost
     template <class T>
     std::size_t hash_value(test::test_type3<T> const& x)
     {
-        std::size_t seed = HASH_NAMESPACE::hash_range(x.values.begin(), x.values.end());
+        std::size_t seed =
+            HASH_NAMESPACE::hash_range(x.values.begin(), x.values.end());
         HASH_NAMESPACE::hash_range(seed, x.values.begin(), x.values.end());
         return seed;
     }
diff --git a/hash/test/hash_fwd_test_1.cpp b/hash/test/hash_fwd_test_1.cpp
index 6c7f8d3..1f27f65 100644
--- a/hash/test/hash_fwd_test_1.cpp
+++ b/hash/test/hash_fwd_test_1.cpp
@@ -68,10 +68,12 @@ void fwd_test3()
     test::test_type3<int> x(values1.begin(), values1.end());
     test::test_type3<std::string> y(values2.begin(), values2.end());
 
-    std::size_t seed1 = HASH_NAMESPACE::hash_range(values1.begin(), values1.end());
+    std::size_t seed1 =
+        HASH_NAMESPACE::hash_range(values1.begin(), values1.end());
     HASH_NAMESPACE::hash_range(seed1, values1.begin(), values1.end());
 
-    std::size_t seed2 = HASH_NAMESPACE::hash_range(values2.begin(), values2.end());
+    std::size_t seed2 =
+        HASH_NAMESPACE::hash_range(values2.begin(), values2.end());
     HASH_NAMESPACE::hash_range(seed2, values2.begin(), values2.end());
 
     HASH_NAMESPACE::hash<test::test_type3<int> > hasher_test_int;
@@ -92,4 +94,3 @@ int main()
 #endif
     return boost::report_errors();
 }
-
diff --git a/hash/test/hash_global_namespace_test.cpp b/hash/test/hash_global_namespace_test.cpp
index ccb99e7..d1d504d 100644
--- a/hash/test/hash_global_namespace_test.cpp
+++ b/hash/test/hash_global_namespace_test.cpp
@@ -85,8 +85,8 @@ void custom_tests()
     HASH_NAMESPACE::hash_combine(seed2, 250u);
     HASH_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_TEST(seed ==
-            HASH_NAMESPACE::hash_range(custom_vector.begin(), custom_vector.end()));
+    BOOST_TEST(seed == HASH_NAMESPACE::hash_range(
+        custom_vector.begin(), custom_vector.end()));
     BOOST_TEST(seed == seed2);
 }
 
diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp
index 6e85dcf..bd0255f 100644
--- a/hash/test/hash_map_test.hpp
+++ b/hash/test/hash_map_test.hpp
@@ -22,19 +22,21 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
     {
         const int number_of_containers = 10;
         T containers[number_of_containers];
-        typedef typename T::value_type pair;
+        typedef BOOST_DEDUCED_TYPENAME T::value_type pair;
+        typedef BOOST_DEDUCED_TYPENAME T::key_type key;
+        typedef BOOST_DEDUCED_TYPENAME T::mapped_type value;
 
         for(int i = 0; i < 5; ++i) {
             for(int j = 0; j < i; ++j)
-                containers[i].insert(pair(0, 0));
+                containers[i].insert(pair(key(0), value(0)));
         }
 
-        containers[6].insert(pair(1,0));
-        containers[7].insert(pair(1,0));
-        containers[7].insert(pair(1,0));
-        containers[8].insert(pair(-1,1));
-        containers[9].insert(pair(-1,3));
-        containers[9].insert(pair(-1,3));
+        containers[6].insert(pair(key(1),value(0)));
+        containers[7].insert(pair(key(1),value(0)));
+        containers[7].insert(pair(key(1),value(0)));
+        containers[8].insert(pair(key(-1),value(1)));
+        containers[9].insert(pair(key(-1),value(3)));
+        containers[9].insert(pair(key(-1),value(3)));
 
         HASH_NAMESPACE::hash<T> hasher;
 
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index 40febc7..b1a52b3 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -55,8 +55,11 @@ void numeric_test(T*)
 
     if (limits::is_integer)
     {
-        if(limits::is_signed || limits::digits <= boost::hash_detail::limits<std::size_t>::digits)
+        if(limits::is_signed ||
+            limits::digits <= boost::hash_detail::limits<std::size_t>::digits)
+        {
             BOOST_TEST(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
+        }
         BOOST_TEST(HASH_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
         BOOST_TEST(HASH_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
         BOOST_TEST(HASH_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index 7d71f45..8743e1e 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -70,10 +70,12 @@ void hash_range_tests()
     BOOST_TEST(HASH_NAMESPACE::hash_range(values3.begin(), values3.end())
         == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
 
-    std::size_t seed = HASH_NAMESPACE::hash_range(values3.begin(), values3.end());
+    std::size_t seed =
+        HASH_NAMESPACE::hash_range(values3.begin(), values3.end());
     HASH_NAMESPACE::hash_range(seed, values4.begin(), values4.end());
     HASH_NAMESPACE::hash_range(seed, x.begin(), x.end());
-    BOOST_TEST(seed == HASH_NAMESPACE::hash_range(values5.begin(), values5.end()));
+    BOOST_TEST(seed ==
+        HASH_NAMESPACE::hash_range(values5.begin(), values5.end()));
 }
 
 int main()
diff --git a/include/boost/functional/hash/detail/float_functions.hpp b/include/boost/functional/hash/detail/float_functions.hpp
index 01cac09..ae03ff0 100644
--- a/include/boost/functional/hash/detail/float_functions.hpp
+++ b/include/boost/functional/hash/detail/float_functions.hpp
@@ -84,7 +84,7 @@ namespace boost {
 // the boost namespace they'll always be preferable to any other function
 // (since the arguments are built in types, ADL can't be used).
 
-namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS {
+namespace boost_hash_detect_float_functions {
     template <class Float> boost::hash_detail::not_found ldexp(Float, int);
     template <class Float> boost::hash_detail::not_found frexp(Float, int*);    
 }
@@ -103,7 +103,7 @@ namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS {
 // happen mainly when there's a template in the same namesapce.
 
 #define BOOST_HASH_CALL_FLOAT_FUNC(cpp_func, c99_func, type1, type2)    \
-namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS {                           \
+namespace boost_hash_detect_float_functions {                           \
     template <class Float>                                              \
     boost::hash_detail::not_found c99_func(Float, type2);               \
 }                                                                       \
@@ -112,7 +112,7 @@ namespace boost {                                                       \
     namespace hash_detail {                                             \
         namespace c99_func##_detect {                                   \
             using namespace std;                                        \
-            using namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS;          \
+            using namespace boost_hash_detect_float_functions;          \
                                                                         \
             struct check {                                              \
                 static type1 x;                                         \
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 697cb41..1f33b9e 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -20,7 +20,8 @@
 #include <boost/type_traits/is_pointer.hpp>
 #endif
 
-#if BOOST_WORKAROUND(__GNUC__, < 3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
+#if BOOST_WORKAROUND(__GNUC__, < 3) \
+    && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
 #define BOOST_HASH_CHAR_TRAITS string_char_traits
 #else
 #define BOOST_HASH_CHAR_TRAITS char_traits
@@ -67,7 +68,8 @@ namespace boost
     std::size_t hash_value(long double v);
 
     template <class Ch, class A>
-    std::size_t hash_value(std::basic_string<Ch, std::BOOST_HASH_CHAR_TRAITS<Ch>, A> const&);
+    std::size_t hash_value(
+        std::basic_string<Ch, std::BOOST_HASH_CHAR_TRAITS<Ch>, A> const&);
 
     // Implementation
 
@@ -200,9 +202,10 @@ namespace boost
 #if defined(BOOST_MSVC)
 #pragma warning(push)
 #if BOOST_MSVC <= 1400
-#pragma warning(disable:4267) // 'argument' : conversion from 'size_t' to 'unsigned int',
-                              // possible loss of data
-                              // A misguided attempt to detect 64-bit incompatability.
+#pragma warning(disable:4267) // 'argument' : conversion from 'size_t' to
+                              // 'unsigned int', possible loss of data
+                              // A misguided attempt to detect 64-bit
+                              // incompatability.
 #endif
 #endif
 
@@ -285,7 +288,8 @@ namespace boost
 #endif
 
     template <class Ch, class A>
-    inline std::size_t hash_value(std::basic_string<Ch, std::BOOST_HASH_CHAR_TRAITS<Ch>, A> const& v)
+    inline std::size_t hash_value(
+        std::basic_string<Ch, std::BOOST_HASH_CHAR_TRAITS<Ch>, A> const& v)
     {
         return hash_range(v.begin(), v.end());
     }
@@ -310,8 +314,8 @@ namespace boost
     //
     
     // Define the specializations required by the standard. The general purpose
-    // boost::hash is defined later in extensions.hpp if BOOST_HASH_NO_EXTENSIONS
-    // is not defined.
+    // boost::hash is defined later in extensions.hpp if
+    // BOOST_HASH_NO_EXTENSIONS is not defined.
     
     // BOOST_HASH_SPECIALIZE - define a specialization for a type which is
     // passed by copy.

From 34133e55305eb9d3e0615618e9f7402452be0682 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 9 Jan 2010 17:17:53 +0000
Subject: [PATCH 066/111] Merge unordered documentation.

[SVN r58844]
---
 hash/doc/changes.qbk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 5ee9150..9d7e26b 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -90,4 +90,10 @@
   instead of trying to configure every possibility manually.
 * Workaround for when STLport doesn't support long double.
 
+[h2 Boost 1.42.0]
+
+* Reduce the number of warnings for Visual C++ warning level 4.
+* Some code formatting changes to fit lines into 80 characters.
+* Rename an internal namespace.
+
 [endsect]

From 2644aeff1236e3c744ddb96c36fb4f7f524d452e Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Fri, 15 Jan 2010 00:56:07 +0000
Subject: [PATCH 067/111] Merge link fix.

[SVN r59013]
---
 hash/doc/tutorial.qbk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index b2f79f5..81c1b15 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -110,7 +110,7 @@ And you can now use [classref boost::hash] with book:
     assert(books.find(dandelion) == books.end());
 
 The full example can be found in:
-[@boost:/libs/functional/hash/examples/books.cpp /libs/functional/hash/examples/books.hpp]
+[@boost:/libs/functional/hash/examples/books.hpp /libs/functional/hash/examples/books.hpp]
 and
 [@boost:/libs/functional/hash/examples/books.cpp /libs/functional/hash/examples/books.cpp].
 

From deb0e998a2e0ba63999d7ee680475c4c0d6a2d18 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 14 Feb 2010 16:31:21 +0000
Subject: [PATCH 068/111] Merge some detail changes.

 - [53670] Avoid C style casts.
 - [55604] Fix #3346 boost/detail/scoped_enum_emulation.hpp enum_t conflict
   with Unix rpc/types.h
 - Don't foward declare containers when using gcc's parallel library and add a
   macro to disable forward declaration. Fixes #3866.


[SVN r59679]
---
 hash/test/Jamfile.v2                |  1 +
 hash/test/container_no_fwd_test.cpp | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 hash/test/container_no_fwd_test.cpp

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 21594ee..4435dd2 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -47,6 +47,7 @@ test-suite functional/hash
             :   <toolset>gcc:<define>_GLIBCXX_DEBUG
                 <toolset>darwin:<define>_GLIBCXX_DEBUG
             :   container_fwd_gcc_debug ]
+        [ run container_no_fwd_test.cpp ]
         [ compile-fail hash_no_ext_fail_test.cpp ]
         [ compile-fail namespace_fail_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
diff --git a/hash/test/container_no_fwd_test.cpp b/hash/test/container_no_fwd_test.cpp
new file mode 100644
index 0000000..cc6f6fa
--- /dev/null
+++ b/hash/test/container_no_fwd_test.cpp
@@ -0,0 +1,14 @@
+
+// Copyright 2010 Daniel James.
+// Distributed under 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)
+
+#define BOOST_DETAIL_NO_CONTAINER_FWD
+
+#include <boost/detail/container_fwd.hpp>
+
+int main()
+{
+    std::set<int> x;
+    std::vector<std::string> y;
+}
\ No newline at end of file

From ce5cb3f9df29058cbe845a685297ecad3285fa84 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 25 Feb 2010 19:05:01 +0000
Subject: [PATCH 069/111] Merge hash and unordered from trunk.

 - Replace uses of deprecated C++0x macros
 - Set length of primes inside template on Sun C++. Fixes #3854
 - Missing newline at end of file.



[SVN r59911]
---
 hash/doc/Jamfile.v2                    | 3 ---
 hash/test/Jamfile.v2                   | 4 ++--
 hash/test/container_no_fwd_test.cpp    | 2 +-
 hash/test/hash_number_test.cpp         | 2 +-
 include/boost/functional/hash/hash.hpp | 6 +++---
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/hash/doc/Jamfile.v2 b/hash/doc/Jamfile.v2
index acdf5ec..c21c881 100644
--- a/hash/doc/Jamfile.v2
+++ b/hash/doc/Jamfile.v2
@@ -5,10 +5,7 @@
 
 xml hash : hash.qbk ;
 boostbook standalone : hash :
-    <xsl:param>html.stylesheet=../../../../../doc/html/boostbook.css
     <xsl:param>boost.root=../../../../..
-    <xsl:param>boost.libraries=../../../../libraries.htm
-    <xsl:param>navig.graphics=1
 
     <xsl:param>chunk.first.sections=1
     <xsl:param>chunk.section.depth=2
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 4435dd2..13a29a9 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -13,8 +13,8 @@ project hash-tests
         <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>msvc:<warnings-as-errors>on
-        #<toolset>gcc:<warnings-as-errors>on
-        #<toolset>darwin:<warnings-as-errors>on
+        <toolset>gcc:<warnings-as-errors>on
+        <toolset>darwin:<warnings-as-errors>on
     ;
 
 test-suite functional/hash
diff --git a/hash/test/container_no_fwd_test.cpp b/hash/test/container_no_fwd_test.cpp
index cc6f6fa..9da09da 100644
--- a/hash/test/container_no_fwd_test.cpp
+++ b/hash/test/container_no_fwd_test.cpp
@@ -11,4 +11,4 @@ int main()
 {
     std::set<int> x;
     std::vector<std::string> y;
-}
\ No newline at end of file
+}
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index b1a52b3..91b9b92 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -152,7 +152,7 @@ int main()
     NUMERIC_TEST(long, hash_long)
     NUMERIC_TEST(unsigned long, ulong)
 
-#if defined(BOOST_HAS_LONG_LONG)
+#if !defined(BOOST_NO_LONG_LONG)
     NUMERIC_TEST_NO_LIMITS(boost::long_long_type, long_long)
     NUMERIC_TEST_NO_LIMITS(boost::ulong_long_type, ulong_long)
 #endif
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 1f33b9e..e85ca5a 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -44,7 +44,7 @@ namespace boost
     std::size_t hash_value(wchar_t);
 #endif
     
-#if defined(BOOST_HAS_LONG_LONG)
+#if !defined(BOOST_NO_LONG_LONG)
     std::size_t hash_value(boost::long_long_type);
     std::size_t hash_value(boost::ulong_long_type);
 #endif
@@ -174,7 +174,7 @@ namespace boost
     }
 #endif
 
-#if defined(BOOST_HAS_LONG_LONG)
+#if !defined(BOOST_NO_LONG_LONG)
     inline std::size_t hash_value(boost::long_long_type v)
     {
         return hash_detail::hash_value_signed(v);
@@ -408,7 +408,7 @@ namespace boost
     BOOST_HASH_SPECIALIZE_REF(std::wstring)
 #endif
 
-#if defined(BOOST_HAS_LONG_LONG)
+#if !defined(BOOST_NO_LONG_LONG)
     BOOST_HASH_SPECIALIZE(boost::long_long_type)
     BOOST_HASH_SPECIALIZE(boost::ulong_long_type)
 #endif

From 5ed2ed3b6bbd506ea9878abf235158e8be196f3d Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 31 Mar 2010 21:39:07 +0000
Subject: [PATCH 070/111] Merge from trunk.

 - Add `quick_erase` for unordered. `erase_return_void` is now deprecated.
   Fixes #3966
 - Avoid collision between 0 and 0.5. Fixes #4038


[SVN r60980]
---
 hash/test/hash_float_test.hpp                   | 17 +++++++++++++++++
 .../hash/detail/hash_float_generic.hpp          |  8 +++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
index 2818bb2..dd1358e 100644
--- a/hash/test/hash_float_test.hpp
+++ b/hash/test/hash_float_test.hpp
@@ -79,6 +79,11 @@ void float_tests(char const* name, T* = 0)
     BOOST_TEST(x1(minus_zero) == HASH_NAMESPACE::hash_value(minus_zero));
 #endif
 
+    BOOST_TEST(x1(zero) != x1(0.5));
+    BOOST_TEST(x1(minus_zero) != x1(0.5));
+    BOOST_TEST(x1(0.5) != x1(-0.5));
+    BOOST_TEST(x1(1) != x1(-1));
+
     using namespace std;
 
 // Doing anything with infinity causes borland to crash.
@@ -176,6 +181,12 @@ void float_tests(char const* name, T* = 0)
     BOOST_TEST(half_max != three_quarter_max);
     BOOST_TEST(quarter_max != three_quarter_max);
 
+    BOOST_TEST(max != -max);
+    BOOST_TEST(half_max != -half_max);
+    BOOST_TEST(quarter_max != -quarter_max);
+    BOOST_TEST(three_quarter_max != -three_quarter_max);
+
+
 #if defined(TEST_EXTENSIONS)
     BOOST_TEST(x1(max) == HASH_NAMESPACE::hash_value(max));
     BOOST_TEST(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
@@ -197,6 +208,12 @@ void float_tests(char const* name, T* = 0)
     BOOST_TEST(x1(half_max) != x1(three_quarter_max));
     BOOST_TEST(x1(three_quarter_max) == x1(three_quarter_max));
 
+    BOOST_TEST(x1(max) != x1(-max));
+    BOOST_TEST(x1(half_max) != x1(-half_max));
+    BOOST_TEST(x1(quarter_max) != x1(-quarter_max));
+    BOOST_TEST(x1(three_quarter_max) != x1(-three_quarter_max));
+
+
 // Intel with gcc stdlib sometimes segfaults on calls to asin and acos.
 #if !((defined(__INTEL_COMPILER) || defined(__ICL) || \
         defined(__ICC) || defined(__ECC)) && \
diff --git a/include/boost/functional/hash/detail/hash_float_generic.hpp b/include/boost/functional/hash/detail/hash_float_generic.hpp
index f9acee9..fdbf53f 100644
--- a/include/boost/functional/hash/detail/hash_float_generic.hpp
+++ b/include/boost/functional/hash/detail/hash_float_generic.hpp
@@ -51,17 +51,15 @@ namespace boost
                     limits<T>::min_exponent;
             }
 
-            // The result of frexp is always between 0.5 and 1, so its
-            // top bit will always be 1. Subtract by 0.5 to remove that.
-            v -= T(0.5);
-            v = ldexp(v, limits<std::size_t>::digits + 1);
+            v = ldexp(v, limits<std::size_t>::digits);
             std::size_t seed = static_cast<std::size_t>(v);
             v -= seed;
 
             // ceiling(digits(T) * log2(radix(T))/ digits(size_t)) - 1;
             std::size_t const length
                 = (limits<T>::digits *
-                        boost::static_log2<limits<T>::radix>::value - 1)
+                        boost::static_log2<limits<T>::radix>::value
+                        + limits<std::size_t>::digits - 1)
                 / limits<std::size_t>::digits;
 
             for(std::size_t i = 0; i != length; ++i)

From 196e95ad344ff13555083e618a32042b7c6fc5e7 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 11 Apr 2010 20:24:04 +0000
Subject: [PATCH 071/111] Disable warnings as errors for hash.

[SVN r61207]
---
 hash/test/Jamfile.v2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 13a29a9..4435dd2 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -13,8 +13,8 @@ project hash-tests
         <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>msvc:<warnings-as-errors>on
-        <toolset>gcc:<warnings-as-errors>on
-        <toolset>darwin:<warnings-as-errors>on
+        #<toolset>gcc:<warnings-as-errors>on
+        #<toolset>darwin:<warnings-as-errors>on
     ;
 
 test-suite functional/hash

From eccff6436cc0aefc40cc79e9e3d70225dba0beea Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 21 Apr 2010 23:00:35 +0000
Subject: [PATCH 072/111] Merge some link fixes and release notes.

[SVN r61474]
---
 hash/doc/changes.qbk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 9d7e26b..4e0d0a9 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -96,4 +96,14 @@
 * Some code formatting changes to fit lines into 80 characters.
 * Rename an internal namespace.
 
+[h2 Boost 1.43.0]
+
+* [@https://svn.boost.org/trac/boost/ticket/3866 Ticket 3866]:
+  Don't foward declare containers when using gcc's parallel library,
+  allow user to stop forward declaration by defining the
+  `BOOST_DETAIL_NO_CONTAINER_FWD` macro.
+* [@https://svn.boost.org/trac/boost/ticket/4038 Ticket 4038]:
+  Avoid hashing 0.5 and 0 to the same number.
+* Stop using deprecated `BOOST_HAS_*` macros.
+
 [endsect]

From 3cec009503b09f14dc86dd7fe2577d02f4566b2a Mon Sep 17 00:00:00 2001
From: Tobias Schwinger <tschwinger@isonews2.com>
Date: Mon, 26 Apr 2010 23:21:31 +0000
Subject: [PATCH 073/111] adds Functional/Forward

[SVN r61597]
---
 forward/doc/Jamfile                           |  19 +
 forward/doc/forward.qbk                       | 316 ++++++++++
 forward/doc/html/boostbook.css                | 528 ++++++++++++++++
 forward/doc/html/index.html                   | 564 ++++++++++++++++++
 forward/index.html                            |  15 +
 forward/test/Jamfile                          |  17 +
 forward/test/forward_adapter.cpp              | 128 ++++
 forward/test/lightweight_forward_adapter.cpp  | 128 ++++
 include/boost/functional/forward_adapter.hpp  | 472 +++++++++++++++
 .../lightweight_forward_adapter.hpp           | 259 ++++++++
 10 files changed, 2446 insertions(+)
 create mode 100644 forward/doc/Jamfile
 create mode 100644 forward/doc/forward.qbk
 create mode 100644 forward/doc/html/boostbook.css
 create mode 100644 forward/doc/html/index.html
 create mode 100644 forward/index.html
 create mode 100644 forward/test/Jamfile
 create mode 100644 forward/test/forward_adapter.cpp
 create mode 100644 forward/test/lightweight_forward_adapter.cpp
 create mode 100644 include/boost/functional/forward_adapter.hpp
 create mode 100644 include/boost/functional/lightweight_forward_adapter.hpp

diff --git a/forward/doc/Jamfile b/forward/doc/Jamfile
new file mode 100644
index 0000000..5665497
--- /dev/null
+++ b/forward/doc/Jamfile
@@ -0,0 +1,19 @@
+
+# (C) Copyright Tobias Schwinger
+#
+# Use modification and distribution are subject to the boost Software License,
+# Version 1.0. (See http:/\/www.boost.org/LICENSE_1_0.txt).
+
+using quickbook ;
+
+xml forward : forward.qbk ;
+boostbook standalone : forward
+  :
+        <xsl:param>boost.root=../../../../..
+        <xsl:param>boost.libraries=../../../../libraries.htm
+        <xsl:param>chunk.section.depth=0
+        <xsl:param>chunk.first.sections=0
+        <xsl:param>generate.section.toc.level=2
+        <xsl:param>toc.max.depth=1
+  ;
+
diff --git a/forward/doc/forward.qbk b/forward/doc/forward.qbk
new file mode 100644
index 0000000..4eb227d
--- /dev/null
+++ b/forward/doc/forward.qbk
@@ -0,0 +1,316 @@
+[library Boost.Functional/Forward
+  [quickbook 1.3]
+  [version 1.0]
+  [authors [Schwinger, Tobias]]
+  [copyright 2007 2008 Tobias Schwinger]
+  [license
+        Distributed under 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])
+  ]
+  [purpose Function object adapters for generic argument forwarding.]
+  [category higher-order]
+  [category generic]
+  [last-revision $Date: 2008/11/01 19:58:50 $]
+]
+
+[def __unspecified__            /unspecified/]
+[def __boost_ref__              [@http://www.boost.org/doc/html/ref.html Boost.Ref]]
+[def __boost_result_of__        [@http://www.boost.org/libs/utility/utility.htm#result_of Boost.ResultOf]]
+[def __boost__result_of__       [@http://www.boost.org/libs/utility/utility.htm#result_of `boost::result_of`]]
+[def __the_forwarding_problem__ [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm The Forwarding Problem]]
+[def __boost_fusion__           [@http://www.boost.org/libs/fusion/doc/html/index.html Boost.Fusion]]
+
+[section Brief Description]
+
+`boost::forward_adapter` provides a reusable adapter template for function
+objects. It forwards RValues as references to const, while leaving LValues
+as-is.
+
+    struct g // function object that only accept LValues
+    {
+        template< typename T0, typename T1, typename T2 >
+        void operator()(T0 & t0, T1 & t1, T2 & t2) const;
+
+        typedef void result_type;
+    };
+
+    // Adapted version also accepts RValues and forwards
+    // them as references to const, LValues as-is
+    typedef boost::forward_adapter<g> f;
+
+Another adapter, `boost::lighweight_forward_adapter` allows forwarding with 
+some help from the user accepting and unwrapping reference wrappers (see 
+__boost_ref__) for reference arguments, const qualifying all other arguments. 
+
+The target functions must be compatible with __boost_result_of__, and so are
+the adapters.
+
+[endsect]
+
+[section Background]
+
+Let's suppose we have some function `f` that we can call like this:
+
+    f(123,a_variable);
+
+Now we want to write another, generic function `g` that can be called the
+same way and returns some object that calls `f` with the same arguments.
+
+    f(123,a_variable) == g(f,123,a_variable).call_f()
+
+[heading Why would we want to do it, anyway?]
+
+Maybe we want to run `f` several times. Or maybe we want to run it within
+another thread. Maybe we just want to encapsulate the call expression for now, 
+and then use it with other code that allows to compose more complex expressions
+in order to decompose it with C++ templates and have the compiler generate some 
+machinery that eventually calls `f` at runtime (in other words; apply a
+technique that is commonly referred to as Expression Templates). 
+
+[heading Now, how do we do it?]
+
+The bad news is: It's impossible. 
+
+That is so because there is a slight difference between a variable and an
+expression that evaluates to its value: Given
+
+    int y;
+    int const z = 0;
+
+and
+
+    template< typename T > void func1(T & x);
+
+we can call
+
+    func1(y); // x is a reference to a non-const object
+    func1(z); // x is a reference to a const object
+
+where
+
+    func1(1); // fails to compile.
+
+This way we can safely have `func1` store its reference argument and the 
+compiler keeps us from storing a reference to an object with temporary lifetime.
+
+It is important to realize that non-constness and whether an object binds to a
+non-const reference parameter are two different properties. The latter is the
+distinction between LValues and RValues. The names stem from the left hand side
+and the right hand side of assignment expressions, thus LValues are typically
+the ones you can assign to, and RValues the temporary results from the right
+hand side expression. 
+
+    y = 1+2;        // a is LValue, 1+2 is the expression producing the RValue,
+    // 1+2 = a;     // usually makes no sense. 
+
+    func1(y);       // works, because y is an LValue
+    // func1(1+2);  // fails to compile, because we only got an RValue.
+
+If we add const qualification on the parameter, our function also accepts
+RValues: 
+
+    template< typename T > void func2(T const & x);
+
+    // [...] function scope:
+    func2(1); // x is a reference to a const temporary, object,
+    func2(y); // x is a reference to a const object, while y is not const, and
+    func2(z); // x is a reference to a const object, just like z.
+
+In all cases, the argument `x` in `func2` is a const-qualified LValue.
+We can use function overloading to identify non-const LValues:
+
+    template< typename T > void func3(T const & x); // #1
+    template< typename T > void func3(T & x);       // #2
+
+    // [...] function scope:
+    func3(1); // x is a reference to a const, temporary object in #1,
+    func3(y); // x is a reference to a non-const object in #2, and
+    func3(z); // x is a reference to a const object in #1.
+
+Note that all arguments `x` in the overloaded function `func3` are LValues.
+In fact, there is no way to transport RValues into a function as-is in C++98.
+Also note that we can't distinguish between what used to be a const qualified
+LValue and an RValue. 
+
+That's as close as we can get to a generic forwarding function `g` as
+described above by the means of C++ 98. See __the_forwarding_problem__ for a
+very detailed discussion including solutions that require language changes.
+
+Now, for actually implementing it, we need 2^N overloads for N parameters
+(each with and without const qualifier) for each number of arguments 
+(that is 2^(Nmax+1) - 2^Nmin). Right, that means the compile-time complexity 
+is O(2^N), however the factor is low so it works quite well for a reasonable
+number (< 10) of arguments.
+
+[endsect]
+
+[section:reference Reference]
+
+[section forward_adapter]
+
+[heading Description]
+
+Function object adapter template whose instances are callable with LValue and
+RValue arguments. RValue arguments are forwarded as reference-to-const typed
+LValues.
+
+An arity can be given as second, numeric non-type template argument to restrict
+forwarding to a specific arity.
+If a third, numeric non-type template argument is present, the second and third 
+template argument are treated as minimum and maximum arity, respectively.
+Specifying an arity can be helpful to improve the readability of diagnostic
+messages and compile time performance.
+
+__boost_result_of__ can be used to determine the result types of specific call
+expressions.
+
+[heading Header]
+    #include <boost/functional/forward_adapter.hpp>
+
+[heading Synopsis]
+
+    namespace boost
+    {
+        template< class Function,
+            int Arity_Or_MinArity = __unspecified__, int MaxArity = __unspecified__ >
+        class forward_adapter;
+    }
+
+[variablelist Notation
+    [[`F`]            [a possibly const qualified function object type or reference type thereof]]
+    [[`f`]            [an object convertible to `F`]]
+    [[`FA`]           [the type `forward_adapter<F>`]]
+    [[`fa`]           [an instance object of `FA`, initialized with `f`]]
+    [[`a0`...`aN`]    [arguments to `fa`]]
+]
+
+The result type of a target function invocation must be
+
+  __boost__result_of__<F*(TA0 [const]&...TAN [const]&])>::type
+
+where `TA0`...`TAN` denote the argument types of `a0`...`aN`.
+
+[heading Expression Semantics]
+
+[table
+    [[Expression]      [Semantics]]
+    [[`FA(f)`]         [creates an adapter, initializes the target function with `f`.]]
+    [[`FA()`]          [creates an adapter, attempts to use `F`'s default constructor.]]
+    [[`fa(a0`...`aN)`] [calls `f` with with arguments `a0`...`aN`.]]
+]
+
+[heading Limits]
+
+The macro BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY can be defined to set the
+maximum call arity. It defaults to 6.
+
+[heading Complexity]
+
+Preprocessing time: O(2^N), where N is the arity limit.
+Compile time: O(2^N), where N depends on the arity range.
+Run time: O(0) if the compiler inlines, O(1) otherwise.
+
+[endsect]
+
+
+[section lightweight_forward_adapter]
+
+[heading Description]
+
+Function object adapter template whose instances are callable with LValue and
+RValue arguments. All arguments are forwarded as reference-to-const typed
+LValues, except for reference wrappers which are unwrapped and may yield
+non-const LValues.
+
+An arity can be given as second, numeric non-type template argument to restrict
+forwarding to a specific arity.
+If a third, numeric non-type template argument is present, the second and third 
+template argument are treated as minimum and maximum arity, respectively.
+Specifying an arity can be helpful to improve the readability of diagnostic
+messages and compile time performance.
+
+__boost_result_of__ can be used to determine the result types of specific call
+expressions.
+
+[heading Header]
+    #include <boost/functional/lightweight_forward_adapter.hpp>
+
+[heading Synopsis]
+
+    namespace boost
+    {
+        template< class Function,
+            int Arity_Or_MinArity = __unspecified__, int MaxArity = __unspecified__ >
+        struct lightweight_forward_adapter;
+    }
+
+[variablelist Notation
+    [[`F`]         [a possibly const qualified function object type or reference type thereof]]
+    [[`f`]         [an object convertible to `F`]]
+    [[`FA`]        [the type `lightweight_forward_adapter<F>`]]
+    [[`fa`]        [an instance of `FA`, initialized with `f`]]
+    [[`a0`...`aN`] [arguments to `fa`]]
+]
+
+The result type of a target function invocation must be
+
+  __boost__result_of__<F*(TA0 [const]&...TAN [const]&])>::type
+
+where `TA0`...`TAN` denote the argument types of `a0`...`aN`.
+
+[heading Expression Semantics]
+
+[table
+    [[Expression]      [Semantics]]
+    [[`FA(f)`]         [creates an adapter, initializes the target function with `f`.]]
+    [[`FA()`]          [creates an adapter, attempts to use `F`'s default constructor.]]
+    [[`fa(a0`...`aN)`] [calls `f` with with const arguments `a0`...`aN`. If `aI` is a 
+      reference wrapper it is unwrapped.]]
+]
+
+[heading Limits]
+
+The macro BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_MAX_ARITY can be defined
+to set the maximum call arity. It defaults to 10.
+
+[heading Complexity]
+
+Preprocessing time: O(N), where N is the arity limit.
+Compile time: O(N), where N is the effective arity of a call.
+Run time: O(0) if the compiler inlines, O(1) otherwise.
+
+[endsect]
+
+[endsect]
+
+
+[section Acknowledgements]
+
+As these utilities are factored out of the __boost_fusion__ functional module, 
+I want to thank Dan Marsden and Joel de Guzman for letting me participate in the
+development of that great library in the first place.
+
+Further, I want to credit the authors of the references below, for their
+in-depth investigation of the problem and the solution implemented here.
+
+Last but not least I want to thank Vesa Karnoven and Paul Mensonides for the
+Boost Preprocessor library. Without it, I would have ended up with an external
+code generator for this one.
+
+[endsect]
+
+
+[section References]
+
+# [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm The Forwarding Problem],
+  Peter Dimov, Howard E. Hinnant, David Abrahams, 2002
+
+# [@http://www.boost.org/libs/utility/utility.htm#result_of Boost.ResultOf],
+  Douglas Gregor, 2004
+
+# [@http://www.boost.org/doc/html/ref.html Boost.Ref], 
+  Jaakko Jarvi, Peter Dimov, Douglas Gregor, David Abrahams, 1999-2002
+
+[endsect]
+
diff --git a/forward/doc/html/boostbook.css b/forward/doc/html/boostbook.css
new file mode 100644
index 0000000..858d43c
--- /dev/null
+++ b/forward/doc/html/boostbook.css
@@ -0,0 +1,528 @@
+/*=============================================================================
+    Copyright (c) 2004 Joel de Guzman
+    http://spirit.sourceforge.net/
+
+    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)
+=============================================================================*/
+
+/*=============================================================================
+    Body defaults
+=============================================================================*/
+
+    body
+    {
+        margin: 1em;
+        font-family: sans-serif;
+    }
+
+/*=============================================================================
+    Paragraphs
+=============================================================================*/
+
+    p
+    {
+        text-align: left;
+        font-size: 10pt;
+        line-height: 1.15;
+    }
+
+/*=============================================================================
+    Program listings
+=============================================================================*/
+
+    /* Code on paragraphs */
+    p tt.computeroutput
+    {
+        font-size: 9pt;
+    }
+
+    pre.synopsis
+    {
+        font-size: 90%;
+        margin: 1pc 4% 0pc 4%;
+        padding: 0.5pc 0.5pc 0.5pc 0.5pc;
+    }
+
+    .programlisting,
+    .screen
+    {
+        font-size: 9pt;
+        display: block;
+        margin: 1pc 4% 0pc 4%;
+        padding: 0.5pc 0.5pc 0.5pc 0.5pc;
+    }
+
+    /* Program listings in tables don't get borders */
+    td .programlisting,
+    td .screen
+    {
+        margin: 0pc 0pc 0pc 0pc;
+        padding:  0pc 0pc 0pc 0pc;
+    }
+
+/*=============================================================================
+    Headings
+=============================================================================*/
+
+    h1, h2, h3, h4, h5, h6
+    {
+        text-align: left;
+        margin: 1em 0em 0.5em 0em;
+        font-weight: bold;
+    }
+
+    h1 { font: 140% }
+    h2 { font: bold 140% }
+    h3 { font: bold 130% }
+    h4 { font: bold 120% }
+    h5 { font: italic 110% }
+    h6 { font: italic 100% }
+
+    /* Top page titles */
+    title,
+    h1.title,
+    h2.title
+    h3.title,
+    h4.title,
+    h5.title,
+    h6.title,
+    .refentrytitle
+    {
+        font-weight: bold;
+        margin-bottom: 1pc;
+    }
+
+    h1.title { font-size: 140% }
+    h2.title { font-size: 140% }
+    h3.title { font-size: 130% }
+    h4.title { font-size: 120% }
+    h5.title { font-size: 110% }
+    h6.title { font-size: 100% }
+
+    .section h1
+    {
+        margin: 0em 0em 0.5em 0em;
+        font-size: 140%;
+    }
+
+    .section h2 { font-size: 140% }
+    .section h3 { font-size: 130% }
+    .section h4 { font-size: 120% }
+    .section h5 { font-size: 110% }
+    .section h6 { font-size: 100% }
+
+    /* Code on titles */
+    h1 tt.computeroutput { font-size: 140% }
+    h2 tt.computeroutput { font-size: 140% }
+    h3 tt.computeroutput { font-size: 130% }
+    h4 tt.computeroutput { font-size: 120% }
+    h5 tt.computeroutput { font-size: 110% }
+    h6 tt.computeroutput { font-size: 100% }
+
+/*=============================================================================
+    Author
+=============================================================================*/
+
+    h3.author
+    {
+        font-size: 100%
+    }
+
+/*=============================================================================
+    Lists
+=============================================================================*/
+
+    li
+    {
+        font-size: 10pt;
+        line-height: 1.3;
+    }
+
+    /* Unordered lists */
+    ul
+    {
+        text-align: left;
+    }
+
+    /* Ordered lists */
+    ol
+    {
+        text-align: left;
+    }
+
+/*=============================================================================
+    Links
+=============================================================================*/
+
+    a
+    {
+        text-decoration: none; /* no underline */
+    }
+
+    a:hover
+    {
+        text-decoration: underline;
+    }
+
+/*=============================================================================
+    Spirit style navigation
+=============================================================================*/
+
+    .spirit-nav
+    {
+        text-align: right;
+    }
+
+    .spirit-nav a
+    {
+        color: white;
+        padding-left: 0.5em;
+    }
+
+    .spirit-nav img
+    {
+        border-width: 0px;
+    }
+
+/*=============================================================================
+    Table of contents
+=============================================================================*/
+
+    .toc
+    {
+       margin: 1pc 4% 0pc 4%;
+       padding: 0.1pc 1pc 0.1pc 1pc;
+       font-size: 80%;
+       line-height: 1.15;
+    }
+
+    .boost-toc
+    {
+       float: right;
+       padding: 0.5pc;
+    }
+
+/*=============================================================================
+    Tables
+=============================================================================*/
+
+    .table-title,
+    div.table p.title
+    {
+        margin-left: 4%;
+        padding-right: 0.5em;
+        padding-left: 0.5em;
+    }
+
+    .informaltable table,
+    .table table
+    {
+        width: 92%;
+        margin-left: 4%;
+        margin-right: 4%;
+    }
+
+    div.informaltable table,
+    div.table table
+    {
+        padding: 4px;
+    }
+
+    /* Table Cells */
+    div.informaltable table tr td,
+    div.table table tr td
+    {
+        padding: 0.5em;
+        text-align: left;
+        font-size: 9pt;
+    }
+
+    div.informaltable table tr th,
+    div.table table tr th
+    {
+        padding: 0.5em 0.5em 0.5em 0.5em;
+        border: 1pt solid white;
+        font-size: 80%;
+    }
+
+/*=============================================================================
+    Blurbs
+=============================================================================*/
+
+    div.note,
+    div.tip,
+    div.important,
+    div.caution,
+    div.warning,
+    div.sidebar
+    {
+        font-size: 9pt; /* A little bit smaller than the main text */
+        line-height: 1.2;
+        display: block;
+        margin: 1pc 4% 0pc 4%;
+        padding: 0.5pc 0.5pc 0.0pc 0.5pc;
+    }
+
+    div.sidebar img
+    {
+        padding: 1pt;
+    }
+
+/*=============================================================================
+    Callouts
+=============================================================================*/
+    .line_callout_bug img
+    {
+        float: left;
+        position:relative;
+        left: 4px;
+        top: -12px;
+        clear: left;
+        margin-left:-22px;
+    }
+
+    .callout_bug img
+    {
+    }
+
+/*=============================================================================
+    Variable Lists
+=============================================================================*/
+
+    /* Make the terms in definition lists bold */
+    div.variablelist dl dt,
+    span.term
+    {
+        font-weight: bold;
+        font-size: 10pt;
+    }
+
+    div.variablelist table tbody tr td
+    {
+        text-align: left;
+        vertical-align: top;
+        padding: 0em 2em 0em 0em;
+        font-size: 10pt;
+        margin: 0em 0em 0.5em 0em;
+        line-height: 1;
+    }
+
+    div.variablelist dl dt
+    {
+        margin-bottom: 0.2em;
+    }
+
+    div.variablelist dl dd
+    {
+        margin: 0em 0em 0.5em 2em;
+        font-size: 10pt;
+    }
+
+    div.variablelist table tbody tr td p,
+    div.variablelist dl dd p
+    {
+        margin: 0em 0em 0.5em 0em;
+        line-height: 1;
+    }
+
+/*=============================================================================
+    Misc
+=============================================================================*/
+
+    /* Title of books and articles in bibliographies */
+    span.title
+    {
+        font-style: italic;
+    }
+
+    span.underline
+    {
+        text-decoration: underline;
+    }
+
+    span.strikethrough
+    {
+        text-decoration: line-through;
+    }
+
+    /* Copyright, Legal Notice */
+    div div.legalnotice p
+    {
+        text-align: left
+    }
+
+/*=============================================================================
+    Colors
+=============================================================================*/
+
+    @media screen
+    {
+    /* Links */
+        a
+        {
+            color: #005a9c;
+        }
+
+        a:visited
+        {
+            color: #9c5a9c;
+        }
+
+        h1 a, h2 a, h3 a, h4 a, h5 a, h6 a,
+        h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover,
+        h1 a:visited, h2 a:visited, h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited
+        {
+            text-decoration: none; /* no underline */
+            color: #000000;
+        }
+
+    /* Syntax Highlighting */
+        .keyword        { color: #0000AA; }
+        .identifier     { color: #000000; }
+        .special        { color: #707070; }
+        .preprocessor   { color: #402080; }
+        .char           { color: teal; }
+        .comment        { color: #800000; }
+        .string         { color: teal; }
+        .number         { color: teal; }
+        .white_bkd      { background-color: #FFFFFF; }
+        .dk_grey_bkd    { background-color: #999999; }
+
+    /* Copyright, Legal Notice */
+        .copyright
+        {
+            color: #666666;
+            font-size: small;
+        }
+
+        div div.legalnotice p
+        {
+            color: #666666;
+        }
+
+    /* Program listing */
+        pre.synopsis
+        {
+            border: 1px solid #DCDCDC;
+        }
+
+        .programlisting,
+        .screen
+        {
+            border: 1px solid #DCDCDC;
+        }
+
+        td .programlisting,
+        td .screen
+        {
+            border: 0px solid #DCDCDC;
+        }
+
+    /* Blurbs */
+        div.note,
+        div.tip,
+        div.important,
+        div.caution,
+        div.warning,
+        div.sidebar
+        {
+            border: 1px solid #DCDCDC;
+        }
+
+    /* Table of contents */
+        .toc
+        {
+            border: 1px solid #DCDCDC;
+        }
+
+    /* Tables */
+        div.informaltable table tr td,
+        div.table table tr td
+        {
+            border: 1px solid #DCDCDC;
+        }
+
+        div.informaltable table tr th,
+        div.table table tr th
+        {
+            background-color: #F0F0F0;
+            border: 1px solid #DCDCDC;
+        }
+
+    /* Misc */
+        span.highlight
+        {
+            color: #00A000;
+        }
+    }
+
+    @media print
+    {
+    /* Links */
+        a
+        {
+            color: black;
+        }
+
+        a:visited
+        {
+            color: black;
+        }
+
+        .spirit-nav
+        {
+            display: none;
+        }
+
+    /* Program listing */
+        pre.synopsis
+        {
+            border: 1px solid gray;
+        }
+
+        .programlisting,
+        .screen
+        {
+            border: 1px solid gray;
+        }
+
+        td .programlisting,
+        td .screen
+        {
+            border: 0px solid #DCDCDC;
+        }
+
+    /* Table of contents */
+        .toc
+        {
+            border: 1px solid gray;
+        }
+
+        .informaltable table,
+        .table table
+        {
+            border: 1px solid gray;
+            border-collapse: collapse;
+        }
+
+    /* Tables */
+        div.informaltable table tr td,
+        div.table table tr td
+        {
+            border: 1px solid gray;
+        }
+
+        div.informaltable table tr th,
+        div.table table tr th
+        {
+            border: 1px solid gray;
+        }
+
+    /* Misc */
+        span.highlight
+        {
+            font-weight: bold;
+        }
+    }
diff --git a/forward/doc/html/index.html b/forward/doc/html/index.html
new file mode 100644
index 0000000..e82fe81
--- /dev/null
+++ b/forward/doc/html/index.html
@@ -0,0 +1,564 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Chapter 1. Boost.Functional/Forward 1.0</title>
+<link rel="stylesheet" href="boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
+<link rel="start" href="index.html" title="Chapter 1. Boost.Functional/Forward 1.0">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
+<td align="center"><a href="../../../../libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
+<td align="center"><a href="../../../../../more/index.htm">More</a></td>
+</tr></table>
+<hr>
+<div class="spirit-nav"></div>
+<div class="chapter" lang="en">
+<div class="titlepage"><div>
+<div><h2 class="title">
+<a name="boost_functional_forward"></a>Chapter 1. Boost.Functional/Forward 1.0</h2></div>
+<div><div class="author"><h3 class="author">
+<span class="firstname">Tobias</span> <span class="surname">Schwinger</span>
+</h3></div></div>
+<div><p class="copyright">Copyright © 2007, 2008 Tobias Schwinger</p></div>
+<div><div class="legalnotice">
+<a name="id934161"></a><p>
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
+      </p>
+</div></div>
+</div></div>
+<div class="toc">
+<p><b>Table of Contents</b></p>
+<dl>
+<dt><span class="section"><a href="index.html#boost_functional_forward.brief_description">Brief Description</a></span></dt>
+<dt><span class="section"><a href="index.html#boost_functional_forward.background">Background</a></span></dt>
+<dt><span class="section"><a href="index.html#boost_functional_forward.reference"> Reference</a></span></dt>
+<dt><span class="section"><a href="index.html#boost_functional_forward.acknowledgements">Acknowledgements</a></span></dt>
+<dt><span class="section"><a href="index.html#boost_functional_forward.references">References</a></span></dt>
+</dl>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_functional_forward.brief_description"></a><a href="index.html#boost_functional_forward.brief_description" title="Brief Description">Brief Description</a></h2></div></div></div>
+<p>
+      <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">forward_adapter</span></code> provides a reusable adapter
+      template for function objects. It forwards RValues as references to const,
+      while leaving LValues as-is.
+    </p>
+<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">g</span> <span class="comment">// function object that only accept LValues
+</span><span class="special">{</span>
+    <span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span> <span class="special">&gt;</span>
+    <span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">T0</span> <span class="special">&amp;</span> <span class="identifier">t0</span><span class="special">,</span> <span class="identifier">T1</span> <span class="special">&amp;</span> <span class="identifier">t1</span><span class="special">,</span> <span class="identifier">T2</span> <span class="special">&amp;</span> <span class="identifier">t2</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+
+    <span class="keyword">typedef</span> <span class="keyword">void</span> <span class="identifier">result_type</span><span class="special">;</span>
+<span class="special">};</span>
+
+<span class="comment">// Adapted version also accepts RValues and forwards
+</span><span class="comment">// them as references to const, LValues as-is
+</span><span class="keyword">typedef</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">forward_adapter</span><span class="special">&lt;</span><span class="identifier">g</span><span class="special">&gt;</span> <span class="identifier">f</span><span class="special">;</span>
+</pre>
+<p>
+      Another adapter, <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">lighweight_forward_adapter</span></code> allows forwarding
+      with some help from the user accepting and unwrapping reference wrappers (see
+      <a href="http://www.boost.org/doc/html/ref.html" target="_top">Boost.Ref</a>) for
+      reference arguments, const qualifying all other arguments.
+    </p>
+<p>
+      The target functions must be compatible with <a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top">Boost.ResultOf</a>,
+      and so are the adapters.
+    </p>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_functional_forward.background"></a><a href="index.html#boost_functional_forward.background" title="Background">Background</a></h2></div></div></div>
+<p>
+      Let's suppose we have some function <code class="computeroutput"><span class="identifier">f</span></code>
+      that we can call like this:
+    </p>
+<pre class="programlisting"><span class="identifier">f</span><span class="special">(</span><span class="number">123</span><span class="special">,</span><span class="identifier">a_variable</span><span class="special">);</span>
+</pre>
+<p>
+      Now we want to write another, generic function <code class="computeroutput"><span class="identifier">g</span></code>
+      that can be called the same way and returns some object that calls <code class="computeroutput"><span class="identifier">f</span></code> with the same arguments.
+    </p>
+<pre class="programlisting"><span class="identifier">f</span><span class="special">(</span><span class="number">123</span><span class="special">,</span><span class="identifier">a_variable</span><span class="special">)</span> <span class="special">==</span> <span class="identifier">g</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span><span class="number">123</span><span class="special">,</span><span class="identifier">a_variable</span><span class="special">).</span><span class="identifier">call_f</span><span class="special">()</span>
+</pre>
+<a name="boost_functional_forward.background.why_would_we_want_to_do_it__anyway_"></a><h3>
+<a name="id934701"></a>
+      <a href="index.html#boost_functional_forward.background.why_would_we_want_to_do_it__anyway_">Why
+      would we want to do it, anyway?</a>
+    </h3>
+<p>
+      Maybe we want to run <code class="computeroutput"><span class="identifier">f</span></code> several
+      times. Or maybe we want to run it within another thread. Maybe we just want
+      to encapsulate the call expression for now, and then use it with other code
+      that allows to compose more complex expressions in order to decompose it with
+      C++ templates and have the compiler generate some machinery that eventually
+      calls <code class="computeroutput"><span class="identifier">f</span></code> at runtime (in other
+      words; apply a technique that is commonly referred to as Expression Templates).
+    </p>
+<a name="boost_functional_forward.background.now__how_do_we_do_it_"></a><h3>
+<a name="id934755"></a>
+      <a href="index.html#boost_functional_forward.background.now__how_do_we_do_it_">Now,
+      how do we do it?</a>
+    </h3>
+<p>
+      The bad news is: It's impossible.
+    </p>
+<p>
+      That is so because there is a slight difference between a variable and an expression
+      that evaluates to its value: Given
+    </p>
+<pre class="programlisting"><span class="keyword">int</span> <span class="identifier">y</span><span class="special">;</span>
+<span class="keyword">int</span> <span class="keyword">const</span> <span class="identifier">z</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+</pre>
+<p>
+      and
+    </p>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T</span> <span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">func1</span><span class="special">(</span><span class="identifier">T</span> <span class="special">&amp;</span> <span class="identifier">x</span><span class="special">);</span>
+</pre>
+<p>
+      we can call
+    </p>
+<pre class="programlisting"><span class="identifier">func1</span><span class="special">(</span><span class="identifier">y</span><span class="special">);</span> <span class="comment">// x is a reference to a non-const object
+</span><span class="identifier">func1</span><span class="special">(</span><span class="identifier">z</span><span class="special">);</span> <span class="comment">// x is a reference to a const object
+</span></pre>
+<p>
+      where
+    </p>
+<pre class="programlisting"><span class="identifier">func1</span><span class="special">(</span><span class="number">1</span><span class="special">);</span> <span class="comment">// fails to compile.
+</span></pre>
+<p>
+      This way we can safely have <code class="computeroutput"><span class="identifier">func1</span></code>
+      store its reference argument and the compiler keeps us from storing a reference
+      to an object with temporary lifetime.
+    </p>
+<p>
+      It is important to realize that non-constness and whether an object binds to
+      a non-const reference parameter are two different properties. The latter is
+      the distinction between LValues and RValues. The names stem from the left hand
+      side and the right hand side of assignment expressions, thus LValues are typically
+      the ones you can assign to, and RValues the temporary results from the right
+      hand side expression.
+    </p>
+<pre class="programlisting"><span class="identifier">y</span> <span class="special">=</span> <span class="number">1</span><span class="special">+</span><span class="number">2</span><span class="special">;</span>        <span class="comment">// a is LValue, 1+2 is the expression producing the RValue,
+</span><span class="comment">// 1+2 = a;     // usually makes no sense. 
+</span>
+<span class="identifier">func1</span><span class="special">(</span><span class="identifier">y</span><span class="special">);</span>       <span class="comment">// works, because y is an LValue
+</span><span class="comment">// func1(1+2);  // fails to compile, because we only got an RValue.
+</span></pre>
+<p>
+      If we add const qualification on the parameter, our function also accepts RValues:
+    </p>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T</span> <span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">func2</span><span class="special">(</span><span class="identifier">T</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">x</span><span class="special">);</span>
+
+<span class="comment">// [...] function scope:
+</span><span class="identifier">func2</span><span class="special">(</span><span class="number">1</span><span class="special">);</span> <span class="comment">// x is a reference to a const temporary, object,
+</span><span class="identifier">func2</span><span class="special">(</span><span class="identifier">y</span><span class="special">);</span> <span class="comment">// x is a reference to a const object, while y is not const, and
+</span><span class="identifier">func2</span><span class="special">(</span><span class="identifier">z</span><span class="special">);</span> <span class="comment">// x is a reference to a const object, just like z.
+</span></pre>
+<p>
+      In all cases, the argument <code class="computeroutput"><span class="identifier">x</span></code>
+      in <code class="computeroutput"><span class="identifier">func2</span></code> is a const-qualified
+      LValue. We can use function overloading to identify non-const LValues:
+    </p>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T</span> <span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">func3</span><span class="special">(</span><span class="identifier">T</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">x</span><span class="special">);</span> <span class="comment">// #1
+</span><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T</span> <span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">func3</span><span class="special">(</span><span class="identifier">T</span> <span class="special">&amp;</span> <span class="identifier">x</span><span class="special">);</span>       <span class="comment">// #2
+</span>
+<span class="comment">// [...] function scope:
+</span><span class="identifier">func3</span><span class="special">(</span><span class="number">1</span><span class="special">);</span> <span class="comment">// x is a reference to a const, temporary object in #1,
+</span><span class="identifier">func3</span><span class="special">(</span><span class="identifier">y</span><span class="special">);</span> <span class="comment">// x is a reference to a non-const object in #2, and
+</span><span class="identifier">func3</span><span class="special">(</span><span class="identifier">z</span><span class="special">);</span> <span class="comment">// x is a reference to a const object in #1.
+</span></pre>
+<p>
+      Note that all arguments <code class="computeroutput"><span class="identifier">x</span></code> in
+      the overloaded function <code class="computeroutput"><span class="identifier">func3</span></code>
+      are LValues. In fact, there is no way to transport RValues into a function
+      as-is in C++98. Also note that we can't distinguish between what used to be
+      a const qualified LValue and an RValue.
+    </p>
+<p>
+      That's as close as we can get to a generic forwarding function <code class="computeroutput"><span class="identifier">g</span></code> as described above by the means of C++
+      98. See <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm" target="_top">The
+      Forwarding Problem</a> for a very detailed discussion including solutions
+      that require language changes.
+    </p>
+<p>
+      Now, for actually implementing it, we need 2^N overloads for N parameters (each
+      with and without const qualifier) for each number of arguments (that is 2^(Nmax+1)
+      - 2^Nmin). Right, that means the compile-time complexity is O(2^N), however
+      the factor is low so it works quite well for a reasonable number (&lt; 10)
+      of arguments.
+    </p>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_functional_forward.reference"></a><a href="index.html#boost_functional_forward.reference" title=" Reference"> Reference</a></h2></div></div></div>
+<div class="toc"><dl>
+<dt><span class="section"><a href="index.html#boost_functional_forward.reference.forward_adapter">forward_adapter</a></span></dt>
+<dt><span class="section"><a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter">lightweight_forward_adapter</a></span></dt>
+</dl></div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_functional_forward.reference.forward_adapter"></a><a href="index.html#boost_functional_forward.reference.forward_adapter" title="forward_adapter">forward_adapter</a></h3></div></div></div>
+<a name="boost_functional_forward.reference.forward_adapter.description"></a><h4>
+<a name="id935594"></a>
+        <a href="index.html#boost_functional_forward.reference.forward_adapter.description">Description</a>
+      </h4>
+<p>
+        Function object adapter template whose instances are callable with LValue
+        and RValue arguments. RValue arguments are forwarded as reference-to-const
+        typed LValues.
+      </p>
+<p>
+        An arity can be given as second, numeric non-type template argument to restrict
+        forwarding to a specific arity. If a third, numeric non-type template argument
+        is present, the second and third template argument are treated as minimum
+        and maximum arity, respectively. Specifying an arity can be helpful to improve
+        the readability of diagnostic messages and compile time performance.
+      </p>
+<p>
+        <a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top">Boost.ResultOf</a>
+        can be used to determine the result types of specific call expressions.
+      </p>
+<a name="boost_functional_forward.reference.forward_adapter.header"></a><h4>
+<a name="id935646"></a>
+        <a href="index.html#boost_functional_forward.reference.forward_adapter.header">Header</a>
+      </h4>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">forward_adapter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<a name="boost_functional_forward.reference.forward_adapter.synopsis"></a><h4>
+<a name="id935721"></a>
+        <a href="index.html#boost_functional_forward.reference.forward_adapter.synopsis">Synopsis</a>
+      </h4>
+<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span>
+<span class="special">{</span>
+    <span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">class</span> <span class="identifier">Function</span><span class="special">,</span>
+        <span class="keyword">int</span> <span class="identifier">Arity_Or_MinArity</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">MaxArity</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span> <span class="special">&gt;</span>
+    <span class="keyword">class</span> <span class="identifier">forward_adapter</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+<div class="variablelist">
+<p class="title"><b>Notation</b></p>
+<dl>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
+<dd><p>
+            a possibly const qualified function object type or reference type thereof
+          </p></dd>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
+<dd><p>
+            an object convertible to <code class="computeroutput"><span class="identifier">F</span></code>
+          </p></dd>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">FA</span></code></span></dt>
+<dd><p>
+            the type <code class="computeroutput"><span class="identifier">forward_adapter</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;</span></code>
+          </p></dd>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">fa</span></code></span></dt>
+<dd><p>
+            an instance object of <code class="computeroutput"><span class="identifier">FA</span></code>,
+            initialized with <code class="computeroutput"><span class="identifier">f</span></code>
+          </p></dd>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code></span></dt>
+<dd><p>
+            arguments to <code class="computeroutput"><span class="identifier">fa</span></code>
+          </p></dd>
+</dl>
+</div>
+<p>
+        The result type of a target function invocation must be
+      </p>
+<pre class="programlisting"><a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">result_of</span></code></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">*(</span><span class="identifier">TA0</span> <span class="special">[</span><span class="keyword">const</span><span class="special">]&amp;...</span><span class="identifier">TAN</span> <span class="special">[</span><span class="keyword">const</span><span class="special">]&amp;])&gt;::</span><span class="identifier">type</span>
+</pre>
+<p>
+        where <code class="computeroutput"><span class="identifier">TA0</span></code>...<code class="computeroutput"><span class="identifier">TAN</span></code> denote the argument types of <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code>.
+      </p>
+<a name="boost_functional_forward.reference.forward_adapter.expression_semantics"></a><h4>
+<a name="id936177"></a>
+        <a href="index.html#boost_functional_forward.reference.forward_adapter.expression_semantics">Expression
+        Semantics</a>
+      </h4>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Expression
+              </p>
+              </th>
+<th>
+              <p>
+                Semantics
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">FA</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                creates an adapter, initializes the target function with <code class="computeroutput"><span class="identifier">f</span></code>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">FA</span><span class="special">()</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                creates an adapter, attempts to use <code class="computeroutput"><span class="identifier">F</span></code>'s
+                default constructor.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">fa</span><span class="special">(</span><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                calls <code class="computeroutput"><span class="identifier">f</span></code> with with
+                arguments <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code>.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_functional_forward.reference.forward_adapter.limits"></a><h4>
+<a name="id936405"></a>
+        <a href="index.html#boost_functional_forward.reference.forward_adapter.limits">Limits</a>
+      </h4>
+<p>
+        The macro BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY can be defined to set
+        the maximum call arity. It defaults to 6.
+      </p>
+<a name="boost_functional_forward.reference.forward_adapter.complexity"></a><h4>
+<a name="id936434"></a>
+        <a href="index.html#boost_functional_forward.reference.forward_adapter.complexity">Complexity</a>
+      </h4>
+<p>
+        Preprocessing time: O(2^N), where N is the arity limit. Compile time: O(2^N),
+        where N depends on the arity range. Run time: O(0) if the compiler inlines,
+        O(1) otherwise.
+      </p>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_functional_forward.reference.lightweight_forward_adapter"></a><a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter" title="lightweight_forward_adapter">lightweight_forward_adapter</a></h3></div></div></div>
+<a name="boost_functional_forward.reference.lightweight_forward_adapter.description"></a><h4>
+<a name="id936485"></a>
+        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.description">Description</a>
+      </h4>
+<p>
+        Function object adapter template whose instances are callable with LValue
+        and RValue arguments. All arguments are forwarded as reference-to-const typed
+        LValues, except for reference wrappers which are unwrapped and may yield
+        non-const LValues.
+      </p>
+<p>
+        An arity can be given as second, numeric non-type template argument to restrict
+        forwarding to a specific arity. If a third, numeric non-type template argument
+        is present, the second and third template argument are treated as minimum
+        and maximum arity, respectively. Specifying an arity can be helpful to improve
+        the readability of diagnostic messages and compile time performance.
+      </p>
+<p>
+        <a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top">Boost.ResultOf</a>
+        can be used to determine the result types of specific call expressions.
+      </p>
+<a name="boost_functional_forward.reference.lightweight_forward_adapter.header"></a><h4>
+<a name="id936540"></a>
+        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.header">Header</a>
+      </h4>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">lightweight_forward_adapter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<a name="boost_functional_forward.reference.lightweight_forward_adapter.synopsis"></a><h4>
+<a name="id936616"></a>
+        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.synopsis">Synopsis</a>
+      </h4>
+<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span>
+<span class="special">{</span>
+    <span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">class</span> <span class="identifier">Function</span><span class="special">,</span>
+        <span class="keyword">int</span> <span class="identifier">Arity_Or_MinArity</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">MaxArity</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span> <span class="special">&gt;</span>
+    <span class="keyword">struct</span> <span class="identifier">lightweight_forward_adapter</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+<div class="variablelist">
+<p class="title"><b>Notation</b></p>
+<dl>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
+<dd><p>
+            a possibly const qualified function object type or reference type thereof
+          </p></dd>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
+<dd><p>
+            an object convertible to <code class="computeroutput"><span class="identifier">F</span></code>
+          </p></dd>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">FA</span></code></span></dt>
+<dd><p>
+            the type <code class="computeroutput"><span class="identifier">lightweight_forward_adapter</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;</span></code>
+          </p></dd>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">fa</span></code></span></dt>
+<dd><p>
+            an instance of <code class="computeroutput"><span class="identifier">FA</span></code>, initialized
+            with <code class="computeroutput"><span class="identifier">f</span></code>
+          </p></dd>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code></span></dt>
+<dd><p>
+            arguments to <code class="computeroutput"><span class="identifier">fa</span></code>
+          </p></dd>
+</dl>
+</div>
+<p>
+        The result type of a target function invocation must be
+      </p>
+<pre class="programlisting"><a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">result_of</span></code></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">*(</span><span class="identifier">TA0</span> <span class="special">[</span><span class="keyword">const</span><span class="special">]&amp;...</span><span class="identifier">TAN</span> <span class="special">[</span><span class="keyword">const</span><span class="special">]&amp;])&gt;::</span><span class="identifier">type</span>
+</pre>
+<p>
+        where <code class="computeroutput"><span class="identifier">TA0</span></code>...<code class="computeroutput"><span class="identifier">TAN</span></code> denote the argument types of <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code>.
+      </p>
+<a name="boost_functional_forward.reference.lightweight_forward_adapter.expression_semantics"></a><h4>
+<a name="id937073"></a>
+        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.expression_semantics">Expression
+        Semantics</a>
+      </h4>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+              <p>
+                Expression
+              </p>
+              </th>
+<th>
+              <p>
+                Semantics
+              </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">FA</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                creates an adapter, initializes the target function with <code class="computeroutput"><span class="identifier">f</span></code>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">FA</span><span class="special">()</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                creates an adapter, attempts to use <code class="computeroutput"><span class="identifier">F</span></code>'s
+                default constructor.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">fa</span><span class="special">(</span><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                calls <code class="computeroutput"><span class="identifier">f</span></code> with with
+                const arguments <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code>. If <code class="computeroutput"><span class="identifier">aI</span></code>
+                is a reference wrapper it is unwrapped.
+              </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<a name="boost_functional_forward.reference.lightweight_forward_adapter.limits"></a><h4>
+<a name="id937311"></a>
+        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.limits">Limits</a>
+      </h4>
+<p>
+        The macro BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_MAX_ARITY can be defined
+        to set the maximum call arity. It defaults to 10.
+      </p>
+<a name="boost_functional_forward.reference.lightweight_forward_adapter.complexity"></a><h4>
+<a name="id937342"></a>
+        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.complexity">Complexity</a>
+      </h4>
+<p>
+        Preprocessing time: O(N), where N is the arity limit. Compile time: O(N),
+        where N is the effective arity of a call. Run time: O(0) if the compiler
+        inlines, O(1) otherwise.
+      </p>
+</div>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_functional_forward.acknowledgements"></a><a href="index.html#boost_functional_forward.acknowledgements" title="Acknowledgements">Acknowledgements</a></h2></div></div></div>
+<p>
+      As these utilities are factored out of the <a href="http://www.boost.org/libs/fusion/doc/html/index.html" target="_top">Boost.Fusion</a>
+      functional module, I want to thank Dan Marsden and Joel de Guzman for letting
+      me participate in the development of that great library in the first place.
+    </p>
+<p>
+      Further, I want to credit the authors of the references below, for their in-depth
+      investigation of the problem and the solution implemented here.
+    </p>
+<p>
+      Last but not least I want to thank Vesa Karnoven and Paul Mensonides for the
+      Boost Preprocessor library. Without it, I would have ended up with an external
+      code generator for this one.
+    </p>
+</div>
+<div class="section" lang="en">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_functional_forward.references"></a><a href="index.html#boost_functional_forward.references" title="References">References</a></h2></div></div></div>
+<div class="orderedlist"><ol type="1">
+<li>
+<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm" target="_top">The
+        Forwarding Problem</a>, Peter Dimov, Howard E. Hinnant, David Abrahams,
+        2002
+      </li>
+<li>
+<a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top">Boost.ResultOf</a>,
+        Douglas Gregor, 2004
+      </li>
+<li>
+<a href="http://www.boost.org/doc/html/ref.html" target="_top">Boost.Ref</a>, Jaakko
+        Jarvi, Peter Dimov, Douglas Gregor, David Abrahams, 1999-2002
+      </li>
+</ol></div>
+</div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"><p><small>Last revised: November 01, 2008 at 19:58:50 GMT</small></p></td>
+<td align="right"><div class="copyright-footer"></div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav"></div>
+</body>
+</html>
diff --git a/forward/index.html b/forward/index.html
new file mode 100644
index 0000000..1803029
--- /dev/null
+++ b/forward/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="refresh" content="0; URL=doc/html/index.html">
+  </head>
+  <body>
+    Automatic redirection failed, click this 
+    <a href="doc/html/index.html">link</a> &nbsp;<hr>
+    <p>© Copyright Tobias Schwinger, 2009</p>
+    <p>Distributed under the Boost Software License, Version 1.0. (See 
+    accompanying file <a href="../../../LICENSE_1_0.txt">
+    LICENSE_1_0.txt</a> or copy at
+    <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
+  </body>
+</html>
diff --git a/forward/test/Jamfile b/forward/test/Jamfile
new file mode 100644
index 0000000..9169456
--- /dev/null
+++ b/forward/test/Jamfile
@@ -0,0 +1,17 @@
+
+# (C) Copyright Tobias Schwinger
+#
+# Use modification and distribution are subject to the boost Software License,
+# Version 1.0. (See http:/\/www.boost.org/LICENSE_1_0.txt).
+
+import testing ;
+
+project forward-tests
+    ;
+
+test-suite functional/forward
+    :
+      [ run forward_adapter.cpp ]
+      [ run lightweight_forward_adapter.cpp ]
+    ;
+
diff --git a/forward/test/forward_adapter.cpp b/forward/test/forward_adapter.cpp
new file mode 100644
index 0000000..2317ce7
--- /dev/null
+++ b/forward/test/forward_adapter.cpp
@@ -0,0 +1,128 @@
+/*=============================================================================
+    Copyright (c) 2007 Tobias Schwinger
+  
+    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).
+==============================================================================*/
+
+#include <boost/config.hpp>
+
+#ifdef BOOST_MSVC
+#   pragma warning(disable: 4244) // no conversion warnings, please
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
+#include <boost/functional/forward_adapter.hpp>
+
+#include <boost/type_traits/is_same.hpp>
+
+#include <boost/blank.hpp>
+#include <boost/noncopyable.hpp>
+
+#include <memory>
+
+template <class Base = boost::blank>
+class test_func : public Base 
+{
+    int val;
+public:
+    test_func(int v) : val(v) { }
+
+    template<class B>
+    test_func(test_func<B> const & that)
+      : val(that.val)
+    { }
+
+    template<class B> friend class test_func;
+
+    int operator()(int & l, int const & r) const
+    {
+        return l=r+val;
+    }
+    long operator()(int & l, int const & r) 
+    {
+        return -(l=r+val);
+    }
+
+    template <typename Sig>
+    struct result
+    {
+        typedef void type;
+    };
+
+    // ensure result_of argument types are what's expected
+    // note: this is *not* how client code should look like 
+    template <class Self>
+    struct result< Self const(int&,int const&) > { typedef int type; };
+
+    template <class Self>
+    struct result< Self(int&,int const&) > { typedef long type; };
+
+    template <class Self>
+    struct result< Self(int&,int&) > { typedef char type; };
+};
+
+enum { int_, long_, char_ };
+
+int type_of(int)  { return int_; }
+int type_of(long) { return long_; }
+int type_of(char) { return char_; }
+
+int main()
+{
+    {
+        using boost::is_same;
+        using boost::result_of;
+        typedef boost::forward_adapter< test_func<> > f;
+
+        // lvalue,rvalue
+        BOOST_TEST(( is_same<
+            result_of< f(int&, int) >::type, long >::value ));
+        BOOST_TEST(( is_same<
+            result_of< f const (int&, int) >::type, int >::value ));
+        // lvalue,const lvalue
+        BOOST_TEST(( is_same<
+            result_of< f(int&, int const &) >::type, long >::value ));
+        BOOST_TEST(( is_same<
+            result_of< f const (int&, int const &) >::type, int >::value ));
+        // lvalue,lvalue
+        BOOST_TEST(( is_same<
+            result_of< f(int&, int&) >::type, char >::value ));
+        BOOST_TEST(( is_same<
+            result_of< f const (int&, int&) >::type, char >::value ));
+    }
+
+    {
+        using boost::noncopyable;
+        using boost::forward_adapter;
+
+        int x = 0;
+        test_func<noncopyable> f(7);
+        forward_adapter< test_func<> > func(f);
+        forward_adapter< test_func<noncopyable> & > func_ref(f);
+        forward_adapter< test_func<noncopyable> & > const func_ref_c(f);
+        forward_adapter< test_func<> const > func_c(f);
+        forward_adapter< test_func<> > const func_c2(f);
+        forward_adapter< test_func<noncopyable> const & > func_c_ref(f);
+
+        BOOST_TEST( type_of( func(x,1) ) == long_ );
+        BOOST_TEST( type_of( func_ref(x,1) ) == long_ );
+        BOOST_TEST( type_of( func_ref_c(x,1) ) == long_ );
+        BOOST_TEST( type_of( func_c(x,1) ) == int_ );
+        BOOST_TEST( type_of( func_c2(x,1) ) == int_ );
+        BOOST_TEST( type_of( func_c_ref(x,1) ) == int_ );
+        BOOST_TEST( type_of( func(x,x) ) == char_ );
+
+        BOOST_TEST( func(x,1) == -8 );
+        BOOST_TEST( func_ref(x,1) == -8 );
+        BOOST_TEST( func_ref_c(x,1) == -8 );
+        BOOST_TEST( func_c(x,1) == 8 );
+        BOOST_TEST( func_c2(x,1) == 8 );
+        BOOST_TEST( func_c_ref(x,1) == 8 );
+    }
+
+    return boost::report_errors();
+}
+
+
diff --git a/forward/test/lightweight_forward_adapter.cpp b/forward/test/lightweight_forward_adapter.cpp
new file mode 100644
index 0000000..7b0d304
--- /dev/null
+++ b/forward/test/lightweight_forward_adapter.cpp
@@ -0,0 +1,128 @@
+/*=============================================================================
+    Copyright (c) 2007 Tobias Schwinger
+  
+    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).
+==============================================================================*/
+
+#include <boost/config.hpp>
+
+#ifdef BOOST_MSVC
+#   pragma warning(disable: 4244) // no conversion warnings, please
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
+#include <boost/functional/lightweight_forward_adapter.hpp>
+
+#include <boost/type_traits/is_same.hpp>
+
+#include <boost/blank.hpp>
+#include <boost/noncopyable.hpp>
+
+#include <memory>
+
+template <class Base = boost::blank>
+class test_func : public Base 
+{
+    int val;
+public:
+    test_func(int v) : val(v) { }
+
+    template<class B>
+    test_func(test_func<B> const & that)
+      : val(that.val)
+    { }
+
+    template<class B> friend class test_func;
+
+    int operator()(int & l, int const & r) const
+    {
+        return l=r+val;
+    }
+    long operator()(int & l, int const & r) 
+    {
+        return -(l=r+val);
+    }
+
+    template <typename Sig>
+    struct result
+    {
+        typedef void type;
+    };
+
+    // ensure result_of argument types are what's expected
+    // note: this is *not* how client code should look like 
+    template <class Self>
+    struct result< Self const(int&,int const&) > { typedef int type; };
+
+    template <class Self>
+    struct result< Self(int&,int const&) > { typedef long type; };
+
+    template <class Self>
+    struct result< Self(int&,int&) > { typedef char type; };
+};
+
+enum { int_, long_, char_ };
+
+int type_of(int)  { return int_; }
+int type_of(long) { return long_; }
+int type_of(char) { return char_; }
+
+int main()
+{
+    {
+        using boost::is_same;
+        using boost::result_of;
+        typedef boost::lightweight_forward_adapter< test_func<> > f;
+        typedef boost::reference_wrapper<int> ref;
+        typedef boost::reference_wrapper<int const> cref;
+
+        // lvalue,rvalue
+        BOOST_TEST(( is_same<
+            result_of< f(ref, int) >::type, long >::value ));
+        BOOST_TEST(( is_same<
+            result_of< f const (ref, int) >::type, int >::value ));
+        // lvalue,const lvalue
+        BOOST_TEST(( is_same<
+            result_of< f(ref, cref) >::type, long >::value ));
+        BOOST_TEST(( is_same<
+            result_of< f const (ref, cref) >::type, int >::value ));
+        // lvalue,lvalue
+        BOOST_TEST(( is_same<
+            result_of< f(ref, ref) >::type, char >::value ));
+        BOOST_TEST(( is_same<
+            result_of< f const (ref, ref) >::type, char >::value ));
+    }
+    {
+        using boost::noncopyable;
+        using boost::lightweight_forward_adapter;
+
+        int v = 0; boost::reference_wrapper<int> x(v);
+        test_func<noncopyable> f(7);
+        lightweight_forward_adapter< test_func<> > func(f);
+        lightweight_forward_adapter< test_func<noncopyable> & > func_ref(f);
+        lightweight_forward_adapter< test_func<noncopyable> & > const func_ref_c(f);
+        lightweight_forward_adapter< test_func<> const > func_c(f);
+        lightweight_forward_adapter< test_func<> > const func_c2(f);
+        lightweight_forward_adapter< test_func<noncopyable> const & > func_c_ref(f);
+
+        BOOST_TEST( type_of( func(x,1) ) == long_ );
+        BOOST_TEST( type_of( func_ref(x,1) ) == long_ );
+        BOOST_TEST( type_of( func_ref_c(x,1) ) == long_ );
+        BOOST_TEST( type_of( func_c(x,1) ) == int_ );
+        BOOST_TEST( type_of( func_c2(x,1) ) == int_ );
+        BOOST_TEST( type_of( func_c_ref(x,1) ) == int_ );
+        BOOST_TEST( type_of( func(x,x) ) == char_ );
+
+        BOOST_TEST( func(x,1) == -8 );
+        BOOST_TEST( func_ref(x,1) == -8 );
+        BOOST_TEST( func_ref_c(x,1) == -8 );
+        BOOST_TEST( func_c(x,1) == 8 );
+        BOOST_TEST( func_c2(x,1) == 8 );
+        BOOST_TEST( func_c_ref(x,1) == 8 );
+    }
+
+    return boost::report_errors();
+}
+
diff --git a/include/boost/functional/forward_adapter.hpp b/include/boost/functional/forward_adapter.hpp
new file mode 100644
index 0000000..c6e61a9
--- /dev/null
+++ b/include/boost/functional/forward_adapter.hpp
@@ -0,0 +1,472 @@
+/*=============================================================================
+    Copyright (c) 2007-2008 Tobias Schwinger
+  
+    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).  
+==============================================================================*/
+
+#ifndef BOOST_FUNCTIONAL_FORWARD_ADAPTER_HPP_INCLUDED
+#   ifndef BOOST_PP_IS_ITERATING
+
+#   include <boost/config.hpp>
+#   include <boost/detail/workaround.hpp>
+
+#   include <boost/preprocessor/iteration/iterate.hpp>
+#   include <boost/preprocessor/repetition/enum_params.hpp>
+#   include <boost/preprocessor/repetition/enum_binary_params.hpp>
+#   include <boost/preprocessor/facilities/intercept.hpp>
+#   include <boost/preprocessor/arithmetic/dec.hpp>
+
+#   include <boost/utility/result_of.hpp>
+
+#   ifndef BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY
+#     define BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY 6
+#   elif BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY < 3
+#     undef  BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY
+#     define BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY 3
+#   endif
+
+
+namespace boost 
+{
+    template< typename Function, int Arity_Or_MinArity = -1, int MaxArity = -1 >
+    class forward_adapter;
+
+    //----- ---- --- -- - -  -   -
+
+    namespace detail
+    {
+        template< class MostDerived, typename Function, typename FunctionConst, 
+            int Arity, int MinArity >
+        struct forward_adapter_impl;
+
+        struct forward_adapter_result
+        {
+            template< typename Sig > struct apply;
+
+            // Utility metafunction for qualification adjustment on arguments
+            template< typename T > struct q          { typedef T const t; };
+            template< typename T > struct q<T const> { typedef T const t; };
+            template< typename T > struct q<T &>     { typedef T       t; };
+
+            // Utility metafunction to choose target function qualification
+            template< typename T > struct c
+            { typedef typename T::target_function_t t; };
+            template< typename T > struct c<T&      >
+            { typedef typename T::target_function_t t; };
+            template< typename T > struct c<T const >
+            { typedef typename T::target_function_const_t t; };
+            template< typename T > struct c<T const&>
+            { typedef typename T::target_function_const_t t; };
+        };
+    }
+
+#   define BOOST_TMP_MACRO(f,fn,fc) \
+        boost::detail::forward_adapter_impl< \
+            forward_adapter<f,Arity_Or_MinArity,MaxArity>, fn, fc, \
+            (MaxArity!=-1? MaxArity :Arity_Or_MinArity!=-1? Arity_Or_MinArity \
+                :BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY), \
+            (Arity_Or_MinArity!=-1? Arity_Or_MinArity : 0) >
+
+    template< typename Function, int Arity_Or_MinArity, int MaxArity >
+    class forward_adapter
+        : public BOOST_TMP_MACRO(Function,Function,Function const)
+        , private Function
+    {
+      public:
+        forward_adapter(Function const& f = Function()) 
+          : Function(f) 
+        { }
+
+        typedef Function        target_function_t;
+        typedef Function const  target_function_const_t;
+
+        Function       & target_function()       { return *this; }
+        Function const & target_function() const { return *this; }
+
+        template< typename Sig > struct result
+            : detail::forward_adapter_result::template apply<Sig>
+        { };
+
+        using BOOST_TMP_MACRO(Function,Function, Function const)::operator();
+    };
+    template< typename Function, int Arity_Or_MinArity, int MaxArity >
+    class forward_adapter< Function const, Arity_Or_MinArity, MaxArity >
+        : public BOOST_TMP_MACRO(Function const, Function const, Function const)
+        , private Function
+    {
+      public:
+        forward_adapter(Function const& f = Function())
+          : Function(f) 
+        { }
+
+        typedef Function const target_function_t;
+        typedef Function const target_function_const_t;
+
+        Function const & target_function() const { return *this; }
+
+        template< typename Sig > struct result
+            : detail::forward_adapter_result::template apply<Sig>
+        { };
+
+        using BOOST_TMP_MACRO(Function const,Function const, Function const)
+            ::operator();
+    };
+    template< typename Function, int Arity_Or_MinArity, int MaxArity >
+    class forward_adapter< Function &, Arity_Or_MinArity, MaxArity >
+        : public BOOST_TMP_MACRO(Function&, Function, Function)
+    {
+        Function& ref_function;
+      public:
+        forward_adapter(Function& f)
+          : ref_function(f) 
+        { }
+
+        typedef Function target_function_t;
+        typedef Function target_function_const_t;
+
+        Function & target_function() const { return this->ref_function; }
+
+        template< typename Sig > struct result
+            : detail::forward_adapter_result::template apply<Sig>
+        { };
+
+        using BOOST_TMP_MACRO(Function&, Function, Function)::operator();
+    }; 
+
+    #undef BOOST_TMP_MACRO
+
+    namespace detail
+    {
+        template< class Self >
+        struct forward_adapter_result::apply< Self() >
+            : boost::result_of< typename c<Self>::t() >
+        { };
+
+        template< class MD, class F, class FC >
+        struct forward_adapter_impl<MD,F,FC,0,0>
+        {
+            inline typename boost::result_of< FC() >::type
+            operator()() const
+            {
+                return static_cast<MD const*>(this)->target_function()();
+            }
+
+            inline typename boost::result_of< F() >::type
+            operator()()
+            {
+                return static_cast<MD*>(this)->target_function()();
+            }
+
+        // closing brace gets generated by preprocessing code, below
+
+#       define BOOST_TMP_MACRO(tpl_params,arg_types,params,args)              \
+            template< tpl_params >                                             \
+            inline typename boost::result_of< FC(arg_types) >::type            \
+            operator()(params) const                                           \
+            {                                                                  \
+                return static_cast<MD const*>(this)->target_function()(args);  \
+            }                                                                  \
+            template< tpl_params >                                             \
+            inline typename boost::result_of< F(arg_types)>::type              \
+            operator()(params)                                                 \
+            {                                                                  \
+                return static_cast<MD*>(this)->target_function()(args);        \
+            }
+
+#       // This is the total number of iterations we need
+#       define count ((1 << BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY+1)-2)
+
+#       // Chain file iteration to virtually one loop
+#       if BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY <= 7
+#         define limit1 count
+#         define limit2 0
+#         define limit3 0
+#       else
+#         if BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY <= 15
+#           define limit1 (count >> 8)
+#           define limit2 255
+#           define limit3 0
+#         else
+#           define limit1 (count >> 16)
+#           define limit2 255
+#           define limit3 255
+#         endif
+#       endif
+
+#       define N 0
+
+#       define  BOOST_PP_FILENAME_1 <boost/functional/forward_adapter.hpp>
+#       define  BOOST_PP_ITERATION_LIMITS (0,limit1)
+#       include BOOST_PP_ITERATE()
+
+#       undef N
+#       undef limit3
+#       undef limit2
+#       undef limit1
+#       undef count
+#       undef BOOST_TMP_MACRO
+
+        };
+
+    } // namespace detail
+
+    template<class F, int A0, int A1>
+    struct result_of<boost::forward_adapter<F,A0,A1> const ()>
+        : boost::detail::forward_adapter_result::template apply<
+            boost::forward_adapter<F,A0,A1> const () >
+    { };
+    template<class F, int A0, int A1>
+    struct result_of<boost::forward_adapter<F,A0,A1>()>
+        : boost::detail::forward_adapter_result::template apply<
+            boost::forward_adapter<F,A0,A1>() >
+    { };
+    template<class F, int A0, int A1>
+    struct result_of<boost::forward_adapter<F,A0,A1> const& ()>
+        : boost::detail::forward_adapter_result::template apply<
+            boost::forward_adapter<F,A0,A1> const () >
+    { };
+    template<class F, int A0, int A1>
+    struct result_of<boost::forward_adapter<F,A0,A1>& ()>
+        : boost::detail::forward_adapter_result::template apply<
+            boost::forward_adapter<F,A0,A1>() >
+    { };
+}
+
+#       define BOOST_FUNCTIONAL_FORWARD_ADAPTER_HPP_INCLUDED
+
+#   elif BOOST_PP_ITERATION_DEPTH() == 1 && limit2
+#     define  BOOST_PP_FILENAME_2 <boost/functional/forward_adapter.hpp>
+#     define  BOOST_PP_ITERATION_LIMITS (0,limit2)
+#     include BOOST_PP_ITERATE()
+#   elif BOOST_PP_ITERATION_DEPTH() == 2 && limit3
+#     define  BOOST_PP_FILENAME_3 <boost/functional/forward_adapter.hpp>
+#     define  BOOST_PP_ITERATION_LIMITS (0,limit3)
+#     include BOOST_PP_ITERATE()
+
+#   else
+
+#     // I is the loop counter
+#     if limit2 && limit3
+#       define I (BOOST_PP_ITERATION_1 << 16 | BOOST_PP_ITERATION_2 << 8 | \
+            BOOST_PP_ITERATION_3)
+#     elif limit2
+#       define I (BOOST_PP_ITERATION_1 << 8 | BOOST_PP_ITERATION_2)
+#     else
+#       define I BOOST_PP_ITERATION_1
+#     endif
+
+#     if I < count
+
+#       // Done for this arity? Increment N
+#       if (I+2 >> N+1) 
+#         if N == 0
+#           undef N
+#           define N 1
+#         elif N == 1
+#           undef N
+#           define N 2
+#         elif N == 2
+#           undef N
+#           define N 3
+#         elif N == 3
+#           undef N
+#           define N 4
+#         elif N == 4
+#           undef N
+#           define N 5
+#         elif N == 5
+#           undef N
+#           define N 6
+#         elif N == 6
+#           undef N
+#           define N 7
+#         elif N == 7
+#           undef N
+#           define N 8
+#         elif N == 8
+#           undef N
+#           define N 9
+#         elif N == 9
+#           undef N
+#           define N 10
+#         elif N == 10
+#           undef N
+#           define N 11
+#         elif N == 11
+#           undef N
+#           define N 12
+#         elif N == 12
+#           undef N
+#           define N 13
+#         elif N == 13
+#           undef N
+#           define N 14
+#         elif N == 14
+#           undef N
+#           define N 15
+#         elif N == 15
+#           undef N
+#           define N 16
+#         endif
+
+        };
+
+        template< class Self, BOOST_PP_ENUM_PARAMS(N,typename T) >
+        struct forward_adapter_result::apply< Self(BOOST_PP_ENUM_PARAMS(N,T)) >
+            : boost::result_of< 
+                typename c<Self>::t(BOOST_PP_ENUM_BINARY_PARAMS(N, 
+                      typename q<T,>::t& BOOST_PP_INTERCEPT)) >
+        { };
+
+        template< class MD, class F, class FC >
+        struct forward_adapter_impl<MD,F,FC,BOOST_PP_DEC(N),N>
+        {
+            template< BOOST_PP_ENUM_PARAMS(N,typename T) >
+            inline typename boost::result_of< F(
+                BOOST_PP_ENUM_BINARY_PARAMS(N,T,& BOOST_PP_INTERCEPT)) >::type
+            operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,T,& BOOST_PP_INTERCEPT));
+        };
+
+        template< class MD, class F, class FC, int MinArity >
+        struct forward_adapter_impl<MD,F,FC,N,MinArity>
+            : forward_adapter_impl<MD,F,FC,BOOST_PP_DEC(N),MinArity>
+        {
+            using forward_adapter_impl<MD,F,FC,BOOST_PP_DEC(N),MinArity>::operator();
+
+#       endif
+
+#       // Zero based count for each arity would be I-(1<<N)+2, but we don't
+#       // need it, unless we need a nicer order.
+
+#       // Macros for the parameter's type modifiers.
+#       if I & 0x000001
+#         define PT0 T0 &
+#       else
+#         define PT0 T0 const &
+#       endif
+#       if I & 0x000002
+#         define PT1 T1 &
+#       else
+#         define PT1 T1 const &
+#       endif
+#       if I & 0x000004
+#         define PT2 T2 &
+#       else
+#         define PT2 T2 const &
+#       endif
+#       if I & 0x000008
+#         define PT3 T3 &
+#       else
+#         define PT3 T3 const &
+#       endif
+#       if I & 0x000010
+#         define PT4 T4 &
+#       else
+#         define PT4 T4 const &
+#       endif
+#       if I & 0x000020
+#         define PT5 T5 &
+#       else
+#         define PT5 T5 const &
+#       endif
+#       if I & 0x000040
+#         define PT6 T6 &
+#       else
+#         define PT6 T6 const &
+#       endif
+#       if I & 0x000080
+#         define PT7 T7 &
+#       else
+#         define PT7 T7 const &
+#       endif
+#       if I & 0x000100
+#         define PT8 T8 &
+#       else
+#         define PT8 T8 const &
+#       endif
+#       if I & 0x000200
+#         define PT9 T9 &
+#       else
+#         define PT9 T9 const &
+#       endif
+#       if I & 0x000400
+#         define PT10 T10 &
+#       else
+#         define PT10 T10 const &
+#       endif
+#       if I & 0x000800
+#         define PT11 T11 &
+#       else
+#         define PT11 T11 const &
+#       endif
+#       if I & 0x001000
+#         define PT12 T12 &
+#       else
+#         define PT12 T12 const &
+#       endif
+#       if I & 0x002000
+#         define PT13 T13 &
+#       else
+#         define PT13 T13 const &
+#       endif
+#       if I & 0x004000
+#         define PT14 T14 &
+#       else
+#         define PT14 T14 const &
+#       endif
+#       if I & 0x008000
+#         define PT15 T15 &
+#       else
+#         define PT15 T15 const &
+#       endif
+
+#       if BOOST_WORKAROUND(BOOST_MSVC,BOOST_TESTED_AT(1400)) 
+            template< BOOST_PP_ENUM_PARAMS(N,typename T) >
+            inline typename boost::result_of<  FC(BOOST_PP_ENUM_PARAMS(N,PT)) 
+                >::type
+            operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,PT,a)) const
+            {
+                return static_cast<MD const* const>(this)
+                    ->target_function()(BOOST_PP_ENUM_PARAMS(N,a));
+            }
+            template< BOOST_PP_ENUM_PARAMS(N,typename T) >
+            inline typename boost::result_of<  F(BOOST_PP_ENUM_PARAMS(N,PT))
+                >::type
+            operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,PT,a))
+            {
+                return static_cast<MD* const>(this)
+                    ->target_function()(BOOST_PP_ENUM_PARAMS(N,a));
+            }
+#       else
+        BOOST_TMP_MACRO(BOOST_PP_ENUM_PARAMS(N,typename T),
+            BOOST_PP_ENUM_PARAMS(N,PT), BOOST_PP_ENUM_BINARY_PARAMS(N,PT,a),
+            BOOST_PP_ENUM_PARAMS(N,a) )
+        // ...generates uglier code but is faster - it caches ENUM_*
+#       endif
+
+#       undef PT0
+#       undef PT1
+#       undef PT2
+#       undef PT3
+#       undef PT4
+#       undef PT5
+#       undef PT6
+#       undef PT7
+#       undef PT8
+#       undef PT9
+#       undef PT10
+#       undef PT11
+#       undef PT12
+#       undef PT13
+#       undef PT14
+#       undef PT15
+
+#     endif // I < count
+
+#     undef I
+#   endif // defined(BOOST_PP_IS_ITERATING)
+
+#endif // include guard
+
diff --git a/include/boost/functional/lightweight_forward_adapter.hpp b/include/boost/functional/lightweight_forward_adapter.hpp
new file mode 100644
index 0000000..d21ac42
--- /dev/null
+++ b/include/boost/functional/lightweight_forward_adapter.hpp
@@ -0,0 +1,259 @@
+/*=============================================================================
+    Copyright (c) 2007 Tobias Schwinger
+  
+    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).
+==============================================================================*/
+
+#ifndef BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_HPP_INCLUDED
+#   ifndef BOOST_PP_IS_ITERATING
+
+#   include <boost/config.hpp>
+#   include <boost/detail/workaround.hpp>
+
+#   include <boost/preprocessor/cat.hpp>
+#   include <boost/preprocessor/iteration/iterate.hpp>
+#   include <boost/preprocessor/repetition/enum.hpp>
+#   include <boost/preprocessor/repetition/enum_params.hpp>
+#   include <boost/preprocessor/repetition/enum_binary_params.hpp>
+#   include <boost/preprocessor/facilities/intercept.hpp>
+
+#   include <boost/utility/result_of.hpp>
+#   include <boost/ref.hpp>
+
+#   ifndef BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_MAX_ARITY
+#     define BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_MAX_ARITY 10
+#   elif BOOST_FUNCTIONAL_FORDWARD_ADAPTER_MAX_ARITY < 3
+#     undef  BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_MAX_ARITY
+#     define BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_MAX_ARITY 3
+#   endif
+
+namespace boost 
+{
+    template< typename Function, int Arity_Or_MinArity = -1, int MaxArity = -1 >
+    class lightweight_forward_adapter;
+
+    //----- ---- --- -- - -  -   -
+
+    namespace detail
+    {
+        template< class MostDerived, typename Function, typename FunctionConst, 
+            int Arity, int MinArity >
+        struct lightweight_forward_adapter_impl;
+
+        struct lightweight_forward_adapter_result
+        {
+            template< typename Sig > struct apply;
+
+            // Utility metafunction for argument transform
+            template< typename T > struct x  { typedef T const& t; };
+            template< typename T > struct x< boost::reference_wrapper<T> >
+            { typedef T& t; };
+            template< typename T > struct x<T&>       : x<T> { };
+            template< typename T > struct x<T const&> : x<T> { };
+            template< typename T > struct x<T const>  : x<T> { };
+
+            // Utility metafunction to choose target function qualification
+            template< typename T > struct c
+            { typedef typename T::target_function_t t; };
+            template< typename T > struct c<T&      >
+            { typedef typename T::target_function_t t; };
+            template< typename T > struct c<T const >
+            { typedef typename T::target_function_const_t t; };
+            template< typename T > struct c<T const&>
+            { typedef typename T::target_function_const_t t; };
+        };
+    }
+
+#   define BOOST_TMP_MACRO(f,fn,fc) \
+        boost::detail::lightweight_forward_adapter_impl< \
+            lightweight_forward_adapter<f,Arity_Or_MinArity,MaxArity>, fn, fc, \
+            (MaxArity!=-1? MaxArity :Arity_Or_MinArity!=-1? Arity_Or_MinArity \
+                :BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_MAX_ARITY), \
+            (Arity_Or_MinArity!=-1? Arity_Or_MinArity : 0) >
+
+    template< typename Function, int Arity_Or_MinArity, int MaxArity >
+    class lightweight_forward_adapter
+        : public BOOST_TMP_MACRO(Function,Function,Function const)
+        , private Function
+    {
+      public:
+        lightweight_forward_adapter(Function const& f = Function()) 
+          : Function(f) 
+        { }
+
+        typedef Function        target_function_t;
+        typedef Function const  target_function_const_t;
+
+        Function       & target_function()       { return *this; }
+        Function const & target_function() const { return *this; }
+
+        template< typename Sig > struct result
+            : detail::lightweight_forward_adapter_result::template apply<Sig>
+        { };
+
+        using BOOST_TMP_MACRO(Function,Function, Function const)::operator();
+    };
+    template< typename Function, int Arity_Or_MinArity, int MaxArity >
+    class lightweight_forward_adapter< Function const, Arity_Or_MinArity, 
+        MaxArity >
+        : public BOOST_TMP_MACRO(Function const, Function const, Function const)
+        , private Function
+    {
+      public:
+        lightweight_forward_adapter(Function const& f = Function())
+          : Function(f) 
+        { }
+
+        typedef Function const target_function_t;
+        typedef Function const target_function_const_t;
+
+        Function const & target_function() const { return *this; }
+
+        template< typename Sig > struct result
+            : detail::lightweight_forward_adapter_result::template apply<Sig>
+        { };
+
+        using BOOST_TMP_MACRO(Function const,Function const, Function const)
+            ::operator();
+    };
+    template< typename Function, int Arity_Or_MinArity, int MaxArity >
+    class lightweight_forward_adapter< Function &, Arity_Or_MinArity, MaxArity >
+        : public BOOST_TMP_MACRO(Function&, Function, Function)
+    {
+        Function& ref_function;
+      public:
+        lightweight_forward_adapter(Function& f)
+          : ref_function(f) 
+        { }
+
+        typedef Function target_function_t;
+        typedef Function target_function_const_t;
+
+        Function & target_function() const { return this->ref_function; }
+
+        template< typename Sig > struct result
+            : detail::lightweight_forward_adapter_result::template apply<Sig>
+        { };
+
+        using BOOST_TMP_MACRO(Function&, Function, Function)::operator();
+    }; 
+
+    #undef BOOST_TMP_MACRO
+
+    namespace detail
+    {
+        template< class Self >
+        struct lightweight_forward_adapter_result::apply< Self() >
+            : boost::result_of< typename c<Self>::t() >
+        { };
+
+        template< class MD, class F, class FC >
+        struct lightweight_forward_adapter_impl<MD,F,FC,0,0>
+            : lightweight_forward_adapter_result
+        {
+            inline typename boost::result_of< FC() >::type
+            operator()() const
+            {
+                return static_cast<MD const*>(this)->target_function()();
+            }
+
+            inline typename boost::result_of< F() >::type
+            operator()()
+            {
+                return static_cast<MD*>(this)->target_function()();
+            }
+        };
+
+#       define  BOOST_PP_FILENAME_1 \
+            <boost/functional/lightweight_forward_adapter.hpp>
+#       define  BOOST_PP_ITERATION_LIMITS                                     \
+            (1,BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_MAX_ARITY) 
+#       include BOOST_PP_ITERATE()
+
+    } // namespace detail
+
+    template<class F, int A0, int A1>
+    struct result_of<boost::lightweight_forward_adapter<F,A0,A1> const ()>
+        : boost::detail::lightweight_forward_adapter_result::template apply<
+            boost::lightweight_forward_adapter<F,A0,A1> const () >
+    { };
+    template<class F, int A0, int A1>
+    struct result_of<boost::lightweight_forward_adapter<F,A0,A1>()>
+        : boost::detail::lightweight_forward_adapter_result::template apply<
+            boost::lightweight_forward_adapter<F,A0,A1>() >
+    { };
+    template<class F, int A0, int A1>
+    struct result_of<boost::lightweight_forward_adapter<F,A0,A1> const& ()>
+        : boost::detail::lightweight_forward_adapter_result::template apply<
+            boost::lightweight_forward_adapter<F,A0,A1> const () >
+    { };
+    template<class F, int A0, int A1>
+    struct result_of<boost::lightweight_forward_adapter<F,A0,A1>& ()>
+        : boost::detail::lightweight_forward_adapter_result::template apply<
+            boost::lightweight_forward_adapter<F,A0,A1>() >
+    { };
+}
+
+#     define BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_HPP_INCLUDED
+
+#   else // defined(BOOST_PP_IS_ITERATING)
+#     define N BOOST_PP_ITERATION() 
+
+        template< class Self, BOOST_PP_ENUM_PARAMS(N,typename T) >
+        struct lightweight_forward_adapter_result::apply<
+            Self (BOOST_PP_ENUM_PARAMS(N,T)) >
+            : boost::result_of<
+                typename c<Self>::t (BOOST_PP_ENUM_BINARY_PARAMS(N,
+                    typename x<T,>::t BOOST_PP_INTERCEPT)) >
+        { };
+
+        template< class MD, class F, class FC >
+        struct lightweight_forward_adapter_impl<MD,F,FC,BOOST_PP_DEC(N),N>
+            : lightweight_forward_adapter_result
+        {
+            template< BOOST_PP_ENUM_PARAMS(N,typename T) >
+            inline typename boost::result_of< F(BOOST_PP_ENUM_BINARY_PARAMS(N,
+                T,const& BOOST_PP_INTERCEPT)) >::type
+            operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,T,& BOOST_PP_INTERCEPT));
+        };
+
+        template< class MD, class F, class FC, int MinArity >
+        struct lightweight_forward_adapter_impl<MD,F,FC,N,MinArity>
+            : lightweight_forward_adapter_impl<MD,F,FC,BOOST_PP_DEC(N),MinArity>
+        {
+            using lightweight_forward_adapter_impl<MD,F,FC,BOOST_PP_DEC(N),
+                MinArity>::operator();
+
+#     define M(z,i,d) \
+          static_cast<typename d::template x<T##i>::t>(a##i)
+
+            template< BOOST_PP_ENUM_PARAMS(N,typename T) >
+            inline typename lightweight_forward_adapter_result::template apply<
+                MD const (BOOST_PP_ENUM_BINARY_PARAMS(N,
+                    T,const& BOOST_PP_INTERCEPT)) >::type
+            operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,T,const& a)) const
+            {
+                typedef lightweight_forward_adapter_result _;
+                return static_cast<MD const*>(this)->target_function()(
+                    BOOST_PP_ENUM(N,M,_));
+            }
+            template< BOOST_PP_ENUM_PARAMS(N,typename T) >
+            inline typename lightweight_forward_adapter_result::template apply<
+                MD (BOOST_PP_ENUM_BINARY_PARAMS(N,
+                    T,const& BOOST_PP_INTERCEPT)) >::type
+            operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,T,const& a))
+            {
+                typedef lightweight_forward_adapter_result _;
+                return static_cast<MD*>(this)->target_function()(
+                    BOOST_PP_ENUM(N,M,_));
+            }
+#     undef M
+      };
+
+#     undef N
+#   endif // defined(BOOST_PP_IS_ITERATING)
+
+#endif // include guard
+

From 6f135105802435f4f229027178fa204e9a961132 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 10 Jul 2010 14:20:45 +0000
Subject: [PATCH 074/111] Merge iostreams, hash.

Including disallowing implicit casts to `hash_value`.


[SVN r63812]
---
 hash/doc/changes.qbk                   |  8 ++++++++
 hash/test/Jamfile.v2                   |  2 ++
 hash/test/implicit_fail_test.cpp       | 21 +++++++++++++++++++++
 hash/test/shared_ptr_fail_test.cpp     | 16 ++++++++++++++++
 include/boost/functional/hash/hash.hpp | 13 +++++++++++++
 5 files changed, 60 insertions(+)
 create mode 100644 hash/test/implicit_fail_test.cpp
 create mode 100644 hash/test/shared_ptr_fail_test.cpp

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 4e0d0a9..bc6f4ca 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -106,4 +106,12 @@
   Avoid hashing 0.5 and 0 to the same number.
 * Stop using deprecated `BOOST_HAS_*` macros.
 
+[h2 Boost 1.44.0]
+
+* Prevent implicit conversions when calling `hash_value`. If you find
+  that the new version breaks your code, you can enable the old
+  behaviour by defining `BOOST_HASH_ALLOW_IMPLICIT_CASTS` - although
+  I would recommend that you update your code to work with the new
+  version.
+
 [endsect]
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 4435dd2..c2d8084 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -50,6 +50,8 @@ test-suite functional/hash
         [ run container_no_fwd_test.cpp ]
         [ compile-fail hash_no_ext_fail_test.cpp ]
         [ compile-fail namespace_fail_test.cpp ]
+        [ compile-fail implicit_fail_test.cpp ]
+        [ compile-fail shared_ptr_fail_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
         [ run hash_no_ext_macro_2.cpp ]
     ;
diff --git a/hash/test/implicit_fail_test.cpp b/hash/test/implicit_fail_test.cpp
new file mode 100644
index 0000000..e48bbcd
--- /dev/null
+++ b/hash/test/implicit_fail_test.cpp
@@ -0,0 +1,21 @@
+
+// Copyright 2010 Daniel James.
+// Distributed under 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)
+
+#include <boost/functional/hash.hpp>
+
+namespace test
+{
+    struct base {};
+    std::size_t hash_value(base const&) { return 0; }
+    
+    struct converts { operator base() const { return base(); } };
+}
+
+int main() {
+    boost::hash<test::converts> hash;
+    test::converts x;
+    
+    hash(x);
+}
diff --git a/hash/test/shared_ptr_fail_test.cpp b/hash/test/shared_ptr_fail_test.cpp
new file mode 100644
index 0000000..b0e045f
--- /dev/null
+++ b/hash/test/shared_ptr_fail_test.cpp
@@ -0,0 +1,16 @@
+
+// Copyright 2010 Daniel James.
+// Distributed under 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)
+
+#include <boost/functional/hash.hpp>
+#include <boost/shared_ptr.hpp>
+
+// This should obviously pass if shared_ptr ever supports Boost.Hash.
+
+int main() {
+    boost::hash<boost::shared_ptr<int> > hash;
+    boost::shared_ptr<int> x(new int(10));
+    
+    hash(x);
+}
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index e85ca5a..54407d6 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -15,6 +15,7 @@
 #include <boost/functional/hash/detail/hash_float.hpp>
 #include <string>
 #include <boost/limits.hpp>
+#include <boost/static_assert.hpp>
 
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 #include <boost/type_traits/is_pointer.hpp>
@@ -29,6 +30,18 @@
 
 namespace boost
 {
+#if !defined(BOOST_HASH_ALLOW_IMPLICIT_CASTS)
+
+    // If you get a static assertion here, it's because hash_value
+    // isn't declared for your type.
+    template <typename T>
+    std::size_t hash_value(T const&) {
+        BOOST_STATIC_ASSERT((T*) 0 && false);
+        return 0;
+    }
+
+#endif
+
     std::size_t hash_value(bool);
     std::size_t hash_value(char);
     std::size_t hash_value(unsigned char);

From 76e621bddd113b0e14c155d10d878ff90b836efa Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 15 Jul 2010 01:12:23 +0000
Subject: [PATCH 075/111] Merge hash, opt-in to breaking change rather than
 opt-out.

[SVN r64031]
---
 hash/doc/changes.qbk                   | 15 ++++++++++-----
 hash/test/Jamfile.v2                   |  1 +
 include/boost/functional/hash/hash.hpp |  5 ++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index bc6f4ca..eec4876 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -108,10 +108,15 @@
 
 [h2 Boost 1.44.0]
 
-* Prevent implicit conversions when calling `hash_value`. If you find
-  that the new version breaks your code, you can enable the old
-  behaviour by defining `BOOST_HASH_ALLOW_IMPLICIT_CASTS` - although
-  I would recommend that you update your code to work with the new
-  version.
+* Add option to prevent implicit conversions when calling `hash_value` by
+  defining `BOOST_HASH_NO_IMPLICIT_CASTS`. When using `boost::hash`
+  for a type that does not have `hash_value` declared but does have
+  an implicit conversion to a type that does, it would use that
+  implicit conversion to hash it. Which can sometimes go very wrong,
+  e.g. using a conversion to bool and only hashing to 2 possible
+  values. Since fixing this is a breaking change and was only
+  approached quite late in the release cycle with little discussion
+  it's opt-in for now. This, or something like it, will become the
+  default in a future version.
 
 [endsect]
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index c2d8084..1b35eed 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -7,6 +7,7 @@ import testing ;
 
 project hash-tests
     : requirements
+        <define>BOOST_HASH_NO_IMPLICIT_CASTS
         <warnings>all
         <toolset>intel:<warnings>on
         <toolset>intel:<cxxflags>-strict-ansi
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 54407d6..108d3ed 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -15,7 +15,10 @@
 #include <boost/functional/hash/detail/hash_float.hpp>
 #include <string>
 #include <boost/limits.hpp>
+
+#if defined(BOOST_HASH_NO_IMPLICIT_CASTS)
 #include <boost/static_assert.hpp>
+#endif
 
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 #include <boost/type_traits/is_pointer.hpp>
@@ -30,7 +33,7 @@
 
 namespace boost
 {
-#if !defined(BOOST_HASH_ALLOW_IMPLICIT_CASTS)
+#if defined(BOOST_HASH_NO_IMPLICIT_CASTS)
 
     // If you get a static assertion here, it's because hash_value
     // isn't declared for your type.

From 2f1946c5417cf2f9e14719a8fbf2ede8aeb35f3f Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 17 Aug 2010 20:00:17 +0000
Subject: [PATCH 076/111] Merge OpenVMS 64 bit patch for hash. Fixes #4477.

[SVN r64869]
---
 include/boost/functional/hash/hash.hpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 108d3ed..0eedf7f 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -209,9 +209,15 @@ namespace boost
     template <class T> std::size_t hash_value(T* v)
 #endif
     {
+#if defined(__VMS) && __INITIAL_POINTER_SIZE == 64
+	// for some reason ptrdiff_t on OpenVMS compiler with
+	// 64 bit is not 64 bit !!!
+        std::size_t x = static_cast<std::size_t>(
+           reinterpret_cast<long long int>(v));
+#else
         std::size_t x = static_cast<std::size_t>(
            reinterpret_cast<std::ptrdiff_t>(v));
-
+#endif
         return x + (x >> 3);
     }
 

From 6d7e2976d3b66d3792cedc411add9de5f80ffd98 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 4 Jan 2011 23:06:53 +0000
Subject: [PATCH 077/111] Merge hash from trunk.

- Avoid `-Wconversion` warnings.


[SVN r67664]
---
 hash/doc/Jamfile.v2                                       | 3 +++
 hash/doc/changes.qbk                                      | 4 ++++
 hash/test/Jamfile.v2                                      | 8 ++++----
 hash/test/hash_complex_test.cpp                           | 2 +-
 hash/test/hash_number_test.cpp                            | 3 ++-
 .../boost/functional/hash/detail/hash_float_generic.hpp   | 4 ++--
 include/boost/functional/hash/hash.hpp                    | 4 ++--
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/hash/doc/Jamfile.v2 b/hash/doc/Jamfile.v2
index c21c881..62e2798 100644
--- a/hash/doc/Jamfile.v2
+++ b/hash/doc/Jamfile.v2
@@ -3,6 +3,9 @@
 # Distributed under 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)
 
+using boostbook ;
+using quickbook ;
+
 xml hash : hash.qbk ;
 boostbook standalone : hash :
     <xsl:param>boost.root=../../../../..
diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index eec4876..eb6572f 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -119,4 +119,8 @@
   it's opt-in for now. This, or something like it, will become the
   default in a future version.
 
+[h2 Boost 1.46.0]
+
+* Avoid warning due with gcc's `-Wconversion` flag.
+
 [endsect]
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 1b35eed..8985875 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -11,8 +11,8 @@ project hash-tests
         <warnings>all
         <toolset>intel:<warnings>on
         <toolset>intel:<cxxflags>-strict-ansi
-        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
-        <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
+        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
+        <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
         <toolset>msvc:<warnings-as-errors>on
         #<toolset>gcc:<warnings-as-errors>on
         #<toolset>darwin:<warnings-as-errors>on
@@ -25,8 +25,8 @@ test-suite functional/hash
         [ run hash_number_test.cpp ]
         [ run hash_pointer_test.cpp ]
         [ run hash_function_pointer_test.cpp ]
-        [ run hash_float_test.cpp : : : <test-info>always_show_run_output ]
-        [ run hash_long_double_test.cpp : : : <test-info>always_show_run_output ]
+        [ run hash_float_test.cpp ]
+        [ run hash_long_double_test.cpp ]
         [ run hash_string_test.cpp ]
         [ run hash_range_test.cpp ]
         [ run hash_custom_test.cpp ]
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
index a2a2dc2..67e2aff 100644
--- a/hash/test/hash_complex_test.cpp
+++ b/hash/test/hash_complex_test.cpp
@@ -69,7 +69,7 @@ void complex_float_tests(Float*)
     generic_complex_tests(complex(0.5,0));
     generic_complex_tests(complex(25,0));
     generic_complex_tests(complex(25,0));
-    generic_complex_tests(complex(-67.5324535,56.23578678));
+    generic_complex_tests(complex(static_cast<Float>(-67.5324535),static_cast<Float>(56.23578678)));
 }
 
 template <class Integer>
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index 91b9b92..b989d22 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -113,7 +113,8 @@ void poor_quality_tests(T*)
     if(T(1) != T(2))
         BOOST_TEST(x1(T(1)) !=  x2(T(2)));
     if((limits::max)() != (limits::max)() - 1)
-        BOOST_TEST(x1((limits::max)()) != x2((limits::max)() - 1));
+        BOOST_TEST(x1(static_cast<T>((limits::max)()))
+            != x2(static_cast<T>((limits::max)() - 1)));
 }
 
 void bool_test()
diff --git a/include/boost/functional/hash/detail/hash_float_generic.hpp b/include/boost/functional/hash/detail/hash_float_generic.hpp
index fdbf53f..1278c2f 100644
--- a/include/boost/functional/hash/detail/hash_float_generic.hpp
+++ b/include/boost/functional/hash/detail/hash_float_generic.hpp
@@ -53,7 +53,7 @@ namespace boost
 
             v = ldexp(v, limits<std::size_t>::digits);
             std::size_t seed = static_cast<std::size_t>(v);
-            v -= seed;
+            v -= static_cast<T>(seed);
 
             // ceiling(digits(T) * log2(radix(T))/ digits(size_t)) - 1;
             std::size_t const length
@@ -66,7 +66,7 @@ namespace boost
             {
                 v = ldexp(v, limits<std::size_t>::digits);
                 std::size_t part = static_cast<std::size_t>(v);
-                v -= part;
+                v -= static_cast<T>(part);
                 hash_float_combine(seed, part);
             }
 
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 0eedf7f..389804c 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -210,8 +210,8 @@ namespace boost
 #endif
     {
 #if defined(__VMS) && __INITIAL_POINTER_SIZE == 64
-	// for some reason ptrdiff_t on OpenVMS compiler with
-	// 64 bit is not 64 bit !!!
+    // for some reason ptrdiff_t on OpenVMS compiler with
+    // 64 bit is not 64 bit !!!
         std::size_t x = static_cast<std::size_t>(
            reinterpret_cast<long long int>(v));
 #else

From c8512e277bb0600ab13bad9594734cb23c5474b3 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 17 Jan 2011 04:15:00 +0000
Subject: [PATCH 078/111] Merge typeindex support for hash. Fixes #4756.

[SVN r68199]
---
 hash/doc/ref.xml                       | 34 ++++++++++++++++++
 hash/test/Jamfile.v2                   |  1 +
 hash/test/hash_type_index_test.cpp     | 48 ++++++++++++++++++++++++++
 include/boost/functional/hash/hash.hpp | 19 ++++++++++
 4 files changed, 102 insertions(+)
 create mode 100644 hash/test/hash_type_index_test.cpp

diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index 47a09d5..318bf85 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -406,6 +406,29 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
         </method>
       </struct-specialization>
 
+      <struct-specialization name="hash">
+        <template></template>
+        <specialization>
+          <template-arg>std::type_index</template-arg>
+        </specialization>
+        <method name="operator()" cv="const">
+          <type>std::size_t</type>
+          <parameter name="val">
+            <paramtype>std::type_index</paramtype>
+          </parameter>
+          <returns>
+            <para><code>val.hash_code()</code></para>
+          </returns>
+          <throws><para>Doesn't throw</para></throws>
+        </method>
+        <notes>
+          <para>
+            Only available if it's in your standard library and Boost.Config
+            is aware of it.
+          </para>
+        </notes>
+      </struct-specialization>
+
       <free-function-group name="Support functions (Boost extension)."> 
 
       <!--
@@ -716,6 +739,11 @@ for(; first != last; ++first)
           <parameter name="val"><paramtype>std::complex&lt;T&gt; const&amp;</paramtype></parameter>
         </signature>
 
+        <signature>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::type_index</paramtype></parameter>
+        </signature>
+
         <description><para>
           Generally shouldn't be called directly by users, instead they should use
           <classname>boost::hash</classname>, <functionname>boost::hash_range</functionname>
@@ -798,6 +826,12 @@ return seed;</programlisting></entry>
                   </entry>
                   <entry>When <code>T</code> is a built in type and <code>val.imag() == 0</code>, the result is equal to <code>hash_value(val.real())</code>. Otherwise an unspecified value, except that equal arguments shall yield the same result.</entry>
                 </row>
+                <row>
+                  <entry>
+                    <code>std::type_index</code>
+                  </entry>
+                  <entry><code>val.hash_code()</code></entry>
+                </row>
               </tbody>
             </tgroup>
           </informaltable>
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 8985875..ab6f2fa 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -40,6 +40,7 @@ test-suite functional/hash
         [ run hash_set_test.cpp ]
         [ run hash_map_test.cpp ]
         [ run hash_complex_test.cpp ]
+        [ run hash_type_index_test.cpp ]
         [ run link_test.cpp link_test_2.cpp ]
         [ run link_ext_test.cpp link_no_ext_test.cpp ]
         [ run extensions_hpp_test.cpp ]
diff --git a/hash/test/hash_type_index_test.cpp b/hash/test/hash_type_index_test.cpp
new file mode 100644
index 0000000..7892918
--- /dev/null
+++ b/hash/test/hash_type_index_test.cpp
@@ -0,0 +1,48 @@
+
+// Copyright 2011 Daniel James.
+// Distributed under 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)
+
+#include "./config.hpp"
+
+#ifdef TEST_STD_INCLUDES
+#  include <functional>
+#else
+#  include <boost/functional/hash.hpp>
+#endif
+#include <boost/config.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+
+#include <typeindex>
+
+void test_type_index() {
+    std::type_index int_index = typeid(int);
+    std::type_index int2_index = typeid(int);
+    std::type_index char_index = typeid(char);
+    
+    HASH_NAMESPACE::hash<std::type_index> hasher;
+    
+    BOOST_TEST(hasher(int_index) == int_index.hash_code());
+    BOOST_TEST(hasher(int_index) == int2_index.hash_code());
+    BOOST_TEST(hasher(char_index) == char_index.hash_code());
+    BOOST_TEST(HASH_NAMESPACE::hash_value(int_index) == int_index.hash_code());
+    BOOST_TEST(HASH_NAMESPACE::hash_value(int_index) == int2_index.hash_code());
+    BOOST_TEST(HASH_NAMESPACE::hash_value(char_index) == char_index.hash_code());
+
+    BOOST_TEST(hasher(int_index) == hasher(int2_index));
+    BOOST_TEST(hasher(int_index) != hasher(char_index));
+}
+#endif
+
+int main()
+{
+#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+    test_type_index();
+#else
+    std::cout<<"<type_index> not available."<<std::endl;
+#endif
+
+    return boost::report_errors();
+}
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 389804c..51ec860 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -24,6 +24,10 @@
 #include <boost/type_traits/is_pointer.hpp>
 #endif
 
+#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#include <typeindex>
+#endif
+
 #if BOOST_WORKAROUND(__GNUC__, < 3) \
     && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
 #define BOOST_HASH_CHAR_TRAITS string_char_traits
@@ -87,6 +91,10 @@ namespace boost
     std::size_t hash_value(
         std::basic_string<Ch, std::BOOST_HASH_CHAR_TRAITS<Ch>, A> const&);
 
+#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+    std::size_t hash_value(std::type_index);
+#endif
+
     // Implementation
 
     namespace hash_detail
@@ -331,6 +339,13 @@ namespace boost
         return boost::hash_detail::float_hash_value(v);
     }
 
+#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+    inline std::size_t hash_value(std::type_index v)
+    {
+        return v.hash_code();
+    }
+#endif
+
     //
     // boost::hash
     //
@@ -435,6 +450,10 @@ namespace boost
     BOOST_HASH_SPECIALIZE(boost::ulong_long_type)
 #endif
 
+#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+    BOOST_HASH_SPECIALIZE(std::type_index)
+#endif
+
 #undef BOOST_HASH_SPECIALIZE
 #undef BOOST_HASH_SPECIALIZE_REF
 

From 5aa6544dfcdb621620a6fb5565828a5786ce1786 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 23 Mar 2011 00:10:03 +0000
Subject: [PATCH 079/111] Hash: merge updated tests.

- Remove shared_ptr_fail_test, since shared_ptr now has a hash function.
- Run several tests with and without implicit casts.


[SVN r70445]
---
 hash/test/Jamfile.v2                |  82 ++++++++++----------
 hash/test/container_fwd_test.cpp    | 114 ----------------------------
 hash/test/container_no_fwd_test.cpp |  14 ----
 hash/test/shared_ptr_fail_test.cpp  |  16 ----
 4 files changed, 44 insertions(+), 182 deletions(-)
 delete mode 100644 hash/test/container_fwd_test.cpp
 delete mode 100644 hash/test/container_no_fwd_test.cpp
 delete mode 100644 hash/test/shared_ptr_fail_test.cpp

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index ab6f2fa..7b3ccd9 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -1,5 +1,5 @@
 
-# Copyright 2005-2008 Daniel James.
+# Copyright 2005-2011 Daniel James.
 # Distributed under 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)
 
@@ -7,7 +7,6 @@ import testing ;
 
 project hash-tests
     : requirements
-        <define>BOOST_HASH_NO_IMPLICIT_CASTS
         <warnings>all
         <toolset>intel:<warnings>on
         <toolset>intel:<cxxflags>-strict-ansi
@@ -20,42 +19,49 @@ project hash-tests
 
 test-suite functional/hash
     :
-        [ run hash_fwd_test_1.cpp ]
-        [ run hash_fwd_test_2.cpp ]
-        [ run hash_number_test.cpp ]
-        [ run hash_pointer_test.cpp ]
-        [ run hash_function_pointer_test.cpp ]
-        [ run hash_float_test.cpp ]
-        [ run hash_long_double_test.cpp ]
-        [ run hash_string_test.cpp ]
-        [ run hash_range_test.cpp ]
-        [ run hash_custom_test.cpp ]
-        [ run hash_global_namespace_test.cpp ]
-        [ run hash_friend_test.cpp ]
-        [ run hash_built_in_array_test.cpp ]
-        [ run hash_value_array_test.cpp ]
-        [ run hash_vector_test.cpp ]
-        [ run hash_list_test.cpp ]
-        [ run hash_deque_test.cpp ]
-        [ run hash_set_test.cpp ]
-        [ run hash_map_test.cpp ]
-        [ run hash_complex_test.cpp ]
-        [ run hash_type_index_test.cpp ]
-        [ run link_test.cpp link_test_2.cpp ]
-        [ run link_ext_test.cpp link_no_ext_test.cpp ]
-        [ run extensions_hpp_test.cpp ]
-        [ run container_fwd_test.cpp ]
-        [ run container_fwd_test.cpp : :
-            :   <toolset>gcc:<define>_GLIBCXX_DEBUG
-                <toolset>darwin:<define>_GLIBCXX_DEBUG
-            :   container_fwd_gcc_debug ]
-        [ run container_no_fwd_test.cpp ]
-        [ compile-fail hash_no_ext_fail_test.cpp ]
-        [ compile-fail namespace_fail_test.cpp ]
-        [ compile-fail implicit_fail_test.cpp ]
-        [ compile-fail shared_ptr_fail_test.cpp ]
-        [ run hash_no_ext_macro_1.cpp ]
-        [ run hash_no_ext_macro_2.cpp ]
+        [ run hash_fwd_test_1.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_fwd_test_2.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_number_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_pointer_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_function_pointer_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_float_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_long_double_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_string_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_range_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_custom_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_global_namespace_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_friend_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_built_in_array_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_value_array_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_vector_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_list_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_deque_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_set_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_map_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_complex_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_type_index_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run link_test.cpp link_test_2.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run link_ext_test.cpp link_no_ext_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run extensions_hpp_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ compile-fail hash_no_ext_fail_test.cpp : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ compile-fail namespace_fail_test.cpp : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ compile-fail implicit_fail_test.cpp : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_no_ext_macro_1.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_no_ext_macro_2.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+    ;
+
+test-suite functional/hash_implicit_casts
+    :
+        [ run hash_number_test.cpp : : : : implicit_number ]
+        [ run hash_pointer_test.cpp : : : : implicit_pointer ]
+        [ run hash_function_pointer_test.cpp : : : : implicit_function_pointer ]
+        [ run hash_float_test.cpp : : : : implicit_float ]
+        [ run hash_string_test.cpp : : : : implicit_string ]
+        [ run hash_range_test.cpp : : : : implicit_range ]
+        [ run hash_custom_test.cpp : : : : implicit_custom ]
+        [ run hash_built_in_array_test.cpp : : : : implicit_built_in_array ]
+        [ run link_test.cpp link_test_2.cpp : : : : implicit_link ]
+        [ run implicit_fail_test.cpp : : : : implicit_test ]
     ;
 
 test-suite functional/hash_no_ext
diff --git a/hash/test/container_fwd_test.cpp b/hash/test/container_fwd_test.cpp
deleted file mode 100644
index ec8cc54..0000000
--- a/hash/test/container_fwd_test.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// Copyright 2005-2009 Daniel James.
-// Distributed under 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)
-
-#include "./config.hpp"
-
-#include <boost/functional/detail/container_fwd.hpp>
-
-#if BOOST_WORKAROUND(__GNUC__, < 3) && \
-    !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
-template <class charT, class Allocator>
-static void test(
-    std::basic_string<charT, std::string_char_traits<charT>, Allocator> const&)
-{
-}
-#else
-template <class charT, class Allocator>
-static void test(
-    std::basic_string<charT, std::char_traits<charT>, Allocator> const&)
-{
-}
-#endif
-    
-template <class T, class Allocator>
-static void test(std::deque<T, Allocator> const&)
-{
-}
-
-template <class T, class Allocator>
-static void test(std::list<T, Allocator> const&)
-{
-}
-
-template <class T, class Allocator>
-static void test(std::vector<T, Allocator> const&)
-{
-}
-
-template <class Key, class T, class Compare, class Allocator>
-static void test(std::map<Key, T, Compare, Allocator> const&)
-{
-}
-
-template <class Key, class T, class Compare, class Allocator>
-static void test(std::multimap<Key, T, Compare, Allocator> const&)
-{
-}
-
-template <class Key, class Compare, class Allocator>
-static void test(std::set<Key, Compare, Allocator> const&)
-{
-}
-
-template <class Key, class Compare, class Allocator>
-static void test(std::multiset<Key, Compare, Allocator> const&)
-{
-}
-
-template <std::size_t N>
-static void test(std::bitset<N> const&)
-{
-}
-
-template <class T>
-static void test(std::complex<T> const&)
-{
-}
-
-template <class X, class Y>
-static void test(std::pair<X, Y> const&)
-{
-}
-
-#include <deque>
-#include <list>
-#include <vector>
-#include <map>
-#include <set>
-#include <bitset>
-#include <string>
-#include <complex>
-#include <utility>
-
-int main()
-{
-    std::deque<int> x1;
-    std::list<std::string> x2;
-    std::vector<float> x3;
-    std::vector<bool> x4;
-    std::map<int, int> x5;
-    std::multimap<float, int*> x6;
-    std::set<std::string> x7;
-    std::multiset<std::vector<int> > x8;
-    std::bitset<10> x9;
-    std::string x10;
-    std::complex<double> x11;
-    std::pair<std::list<int>, char***> x12;
-
-    test(x1);
-    test(x2);
-    test(x3);
-    test(x4);
-    test(x5);
-    test(x6);
-    test(x7);
-    test(x8);
-    test(x9);
-    test(x10);
-    test(x11);
-    test(x12);
-
-    return 0;
-}
diff --git a/hash/test/container_no_fwd_test.cpp b/hash/test/container_no_fwd_test.cpp
deleted file mode 100644
index 9da09da..0000000
--- a/hash/test/container_no_fwd_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-// Copyright 2010 Daniel James.
-// Distributed under 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)
-
-#define BOOST_DETAIL_NO_CONTAINER_FWD
-
-#include <boost/detail/container_fwd.hpp>
-
-int main()
-{
-    std::set<int> x;
-    std::vector<std::string> y;
-}
diff --git a/hash/test/shared_ptr_fail_test.cpp b/hash/test/shared_ptr_fail_test.cpp
deleted file mode 100644
index b0e045f..0000000
--- a/hash/test/shared_ptr_fail_test.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-
-// Copyright 2010 Daniel James.
-// Distributed under 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)
-
-#include <boost/functional/hash.hpp>
-#include <boost/shared_ptr.hpp>
-
-// This should obviously pass if shared_ptr ever supports Boost.Hash.
-
-int main() {
-    boost::hash<boost::shared_ptr<int> > hash;
-    boost::shared_ptr<int> x(new int(10));
-    
-    hash(x);
-}

From 68bfa12696efed2df5f6f3574a422fe663862875 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 24 Mar 2011 20:28:33 +0000
Subject: [PATCH 080/111] Functional: Merge old change to use
 `BOOST_DEDUCED_TYPENAME`.

[SVN r70516]
---
 include/boost/functional/forward_adapter.hpp             | 4 ++--
 include/boost/functional/lightweight_forward_adapter.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/boost/functional/forward_adapter.hpp b/include/boost/functional/forward_adapter.hpp
index c6e61a9..796abd2 100644
--- a/include/boost/functional/forward_adapter.hpp
+++ b/include/boost/functional/forward_adapter.hpp
@@ -141,7 +141,7 @@ namespace boost
     {
         template< class Self >
         struct forward_adapter_result::apply< Self() >
-            : boost::result_of< typename c<Self>::t() >
+            : boost::result_of< BOOST_DEDUCED_TYPENAME c<Self>::t() >
         { };
 
         template< class MD, class F, class FC >
@@ -316,7 +316,7 @@ namespace boost
         template< class Self, BOOST_PP_ENUM_PARAMS(N,typename T) >
         struct forward_adapter_result::apply< Self(BOOST_PP_ENUM_PARAMS(N,T)) >
             : boost::result_of< 
-                typename c<Self>::t(BOOST_PP_ENUM_BINARY_PARAMS(N, 
+                BOOST_DEDUCED_TYPENAME c<Self>::t(BOOST_PP_ENUM_BINARY_PARAMS(N, 
                       typename q<T,>::t& BOOST_PP_INTERCEPT)) >
         { };
 
diff --git a/include/boost/functional/lightweight_forward_adapter.hpp b/include/boost/functional/lightweight_forward_adapter.hpp
index d21ac42..637aa9e 100644
--- a/include/boost/functional/lightweight_forward_adapter.hpp
+++ b/include/boost/functional/lightweight_forward_adapter.hpp
@@ -146,7 +146,7 @@ namespace boost
     {
         template< class Self >
         struct lightweight_forward_adapter_result::apply< Self() >
-            : boost::result_of< typename c<Self>::t() >
+            : boost::result_of< BOOST_DEDUCED_TYPENAME c<Self>::t() >
         { };
 
         template< class MD, class F, class FC >
@@ -205,7 +205,7 @@ namespace boost
         struct lightweight_forward_adapter_result::apply<
             Self (BOOST_PP_ENUM_PARAMS(N,T)) >
             : boost::result_of<
-                typename c<Self>::t (BOOST_PP_ENUM_BINARY_PARAMS(N,
+                BOOST_DEDUCED_TYPENAME c<Self>::t (BOOST_PP_ENUM_BINARY_PARAMS(N,
                     typename x<T,>::t BOOST_PP_INTERCEPT)) >
         { };
 

From 5385cc4cd4568a6e45d3c08f2753b3221959268e Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 17 Oct 2011 20:23:27 +0000
Subject: [PATCH 081/111] Merge unordered+hash documentation updates.

[SVN r75015]
---
 hash/doc/hash.qbk        |  5 ++++
 hash/doc/intro.qbk       | 10 +++++---
 hash/doc/portability.qbk | 12 ----------
 hash/doc/rationale.qbk   | 50 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 hash/doc/rationale.qbk

diff --git a/hash/doc/hash.qbk b/hash/doc/hash.qbk
index b734fb4..fe428f3 100644
--- a/hash/doc/hash.qbk
+++ b/hash/doc/hash.qbk
@@ -14,11 +14,16 @@
     ]
 ]
 
+[def __issues__
+    [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1837.pdf
+    Library Extension Technical Report Issues List]]
+
 [include:hash intro.qbk]
 [include:hash tutorial.qbk]
 [include:hash portability.qbk]
 [include:hash disable.qbk]
 [include:hash changes.qbk]
+[include:hash rationale.qbk]
 [xinclude ref.xml]
 [include:hash links.qbk]
 [include:hash thanks.qbk]
diff --git a/hash/doc/intro.qbk b/hash/doc/intro.qbk
index b027719..076e997 100644
--- a/hash/doc/intro.qbk
+++ b/hash/doc/intro.qbk
@@ -18,9 +18,6 @@
 [def __multi-index-short__ [@boost:/libs/multi_index/doc/index.html
     Boost.MultiIndex]]
 [def __bimap__ [@boost:/libs/bimap/index.html Boost.Bimap]]
-[def __issues__
-    [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1837.pdf
-    Library Extension Technical Report Issues List]]
 [def __hash-function__ [@http://en.wikipedia.org/wiki/Hash_function hash function]]
 [def __hash-table__ [@http://en.wikipedia.org/wiki/Hash_table hash table]]
 
@@ -44,5 +41,12 @@ __issues__ (page 63), this adds support for:
 * the standard containers.
 * extending [classref boost::hash] for custom types.
 
+[note
+This hash function is designed to be used in containers based on
+the STL and is not suitable as a general purpose hash function.
+For more details see the [link hash.rationale rationale].
+]
+
+
 [endsect]
 
diff --git a/hash/doc/portability.qbk b/hash/doc/portability.qbk
index fabb298..a65bc19 100644
--- a/hash/doc/portability.qbk
+++ b/hash/doc/portability.qbk
@@ -90,16 +90,4 @@ boost namespace:
 Full code for this example is at
 [@boost:/libs/functional/hash/examples/portable.cpp /libs/functional/hash/examples/portable.cpp].
 
-[h2 Other Issues]
-
-On Visual C++ versions 6.5 and 7.0, `hash_value` isn't overloaded for built in
-arrays. __boost_hash__, [funcref boost::hash_combine] and [funcref boost::hash_range] all use a workaround to
-support built in arrays so this shouldn't be a problem in most cases.
-
-On Visual C++ versions 6.5 and 7.0, function pointers aren't currently supported.
-
-When using GCC on Solaris, `boost::hash_value(long double)` treats
-`long double`s as `double`s - so the hash function doesn't take into account the
-full range of values.
-
 [endsect]
diff --git a/hash/doc/rationale.qbk b/hash/doc/rationale.qbk
new file mode 100644
index 0000000..f01605b
--- /dev/null
+++ b/hash/doc/rationale.qbk
@@ -0,0 +1,50 @@
+
+[/ Copyright 2011 Daniel James.
+ / Distributed under 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) ]
+
+[section:rationale Rationale]
+
+The rationale for the design can be found in the original design
+[footnote issue 6.18 of the __issues__ (page 63)], but an issue that
+occasionally comes up is the quality of the hash function, so that
+demands some more attention.
+
+Many hash functions strive to have little correlation between the input
+and output values. They attempt to uniformally distribute the output
+values for very similar inputs. This hash function makes no such
+attempt. In fact, for integers, the result of the hash function is often
+just the input value. So similar but different input values will often
+result in similar but different output values.
+
+This means that it is not appropriate as a general hash function. For
+example, a hash table may discard bits from the hash function resulting
+in likely collisions, or might have poor collision resolution when hash
+values are clustered together. In such cases this hash function will
+preform poorly.
+
+So why not implement a higher quality hash function? Well, the standard
+makes no such guarantee, it just requires that the hashes of two
+different values are unlikely to collide. Containers or algorithms
+designed to work with the standard hash function will have to be
+implemented to work well when the hash function's output is correlated
+to its input. Since they are paying that cost a higher quality hash function
+would be wasteful.
+
+For other use cases, if you do need a higher quality hash function,
+there are several options
+available. One is to use a second hash on the output of this hash
+function, such as [@http://www.concentric.net/~ttwang/tech/inthash.htm
+Thomas Wang's hash function]. This this may not work as
+well as a hash algorithm tailored for the input.
+
+For strings that are several fast, high quality hash functions
+available (for example [@http://code.google.com/p/smhasher/ MurmurHash3]
+and [@http://code.google.com/p/cityhash/ Google's CityHash]),
+although they tend to be more machine specific.
+These may also be appropriate for hashing a binary representation of
+your data - providing that all equal values have an equal
+representation, which is not always the case (e.g. for floating point
+values).
+
+[endsect]
\ No newline at end of file

From 40c9e2be589ceb17583335365be9589be985777c Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 15 Jan 2012 20:49:40 +0000
Subject: [PATCH 082/111] Hash: Merge documentation changes.

[SVN r76533]
---
 hash/doc/hash.qbk      |  2 +-
 hash/doc/rationale.qbk | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hash/doc/hash.qbk b/hash/doc/hash.qbk
index fe428f3..cdb72d4 100644
--- a/hash/doc/hash.qbk
+++ b/hash/doc/hash.qbk
@@ -1,5 +1,5 @@
 [library Boost.Functional/Hash
-    [quickbook 1.4]
+    [quickbook 1.5]
     [authors [James, Daniel]]
     [copyright 2005 2006 2007 2008 Daniel James]
     [purpose A TR1 hash function object that can be extended to hash user
diff --git a/hash/doc/rationale.qbk b/hash/doc/rationale.qbk
index f01605b..273392f 100644
--- a/hash/doc/rationale.qbk
+++ b/hash/doc/rationale.qbk
@@ -5,10 +5,10 @@
 
 [section:rationale Rationale]
 
-The rationale for the design can be found in the original design
-[footnote issue 6.18 of the __issues__ (page 63)], but an issue that
-occasionally comes up is the quality of the hash function, so that
-demands some more attention.
+The rationale can be found in the original design
+[footnote issue 6.18 of the __issues__ (page 63)].
+
+[heading:quality Quality of the hash function]
 
 Many hash functions strive to have little correlation between the input
 and output values. They attempt to uniformally distribute the output
@@ -16,23 +16,23 @@ values for very similar inputs. This hash function makes no such
 attempt. In fact, for integers, the result of the hash function is often
 just the input value. So similar but different input values will often
 result in similar but different output values.
-
 This means that it is not appropriate as a general hash function. For
 example, a hash table may discard bits from the hash function resulting
 in likely collisions, or might have poor collision resolution when hash
 values are clustered together. In such cases this hash function will
 preform poorly.
 
-So why not implement a higher quality hash function? Well, the standard
-makes no such guarantee, it just requires that the hashes of two
-different values are unlikely to collide. Containers or algorithms
+But the standard has no such requirement for the hash function,
+it just requires that the hashes of two different values are unlikely
+to collide. Containers or algorithms
 designed to work with the standard hash function will have to be
 implemented to work well when the hash function's output is correlated
 to its input. Since they are paying that cost a higher quality hash function
 would be wasteful.
 
 For other use cases, if you do need a higher quality hash function,
-there are several options
+then neither the standard hash function or `boost::hash` are appropriate.
+There are several options
 available. One is to use a second hash on the output of this hash
 function, such as [@http://www.concentric.net/~ttwang/tech/inthash.htm
 Thomas Wang's hash function]. This this may not work as
@@ -47,4 +47,4 @@ your data - providing that all equal values have an equal
 representation, which is not always the case (e.g. for floating point
 values).
 
-[endsect]
\ No newline at end of file
+[endsect]

From 34f5d8e9665530c9deb7cb40c0984071217e6fa8 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 9 Feb 2012 09:26:00 +0000
Subject: [PATCH 083/111] Hash: Merge documentation fix.

[SVN r76955]
---
 hash/doc/rationale.qbk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hash/doc/rationale.qbk b/hash/doc/rationale.qbk
index 273392f..ab03d8b 100644
--- a/hash/doc/rationale.qbk
+++ b/hash/doc/rationale.qbk
@@ -8,7 +8,7 @@
 The rationale can be found in the original design
 [footnote issue 6.18 of the __issues__ (page 63)].
 
-[heading:quality Quality of the hash function]
+[heading Quality of the hash function]
 
 Many hash functions strive to have little correlation between the input
 and output values. They attempt to uniformally distribute the output

From de90bf39a561301e1c9ca1ed58bbb8bd69da250e Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 3 May 2012 22:05:21 +0000
Subject: [PATCH 084/111] Unordered/Hash: Merge from trunk.

[SVN r78319]
---
 hash/doc/changes.qbk                          |   7 ++
 hash/doc/ref.xml                              |  30 ++++-
 hash/test/Jamfile.v2                          |   6 +-
 hash/test/hash_complex_test.cpp               |   4 +
 hash/test/hash_float_test.hpp                 |   4 +
 hash/test/hash_map_test.cpp                   |   2 +-
 hash/test/hash_number_test.cpp                |   4 +
 hash/test/hash_std_array_test.cpp             | 103 ++++++++++++++++++
 hash/test/hash_std_tuple_test.cpp             |  77 +++++++++++++
 .../hash/detail/container_fwd_0x.hpp          |  41 +++++++
 .../functional/hash/detail/hash_float.hpp     |  16 ++-
 include/boost/functional/hash/extensions.hpp  |  89 +++++++++++++--
 12 files changed, 368 insertions(+), 15 deletions(-)
 create mode 100644 hash/test/hash_std_array_test.cpp
 create mode 100644 hash/test/hash_std_tuple_test.cpp
 create mode 100644 include/boost/functional/hash/detail/container_fwd_0x.hpp

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index eb6572f..c47bd56 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -123,4 +123,11 @@
 
 * Avoid warning due with gcc's `-Wconversion` flag.
 
+[h2 Boost 1.50.0]
+
+* [@http://svn.boost.org/trac/boost/ticket/6771 Ticket 6771]:
+  Avoid gcc's `-Wfloat-equal` warning.
+* [@http://svn.boost.org/trac/boost/ticket/6806 Ticket 6806]:
+  Support `std::array` and `std::tuple` when available.
+
 [endsect]
diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index 318bf85..fa29fcd 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -744,6 +744,25 @@ for(; first != last; ++first)
           <parameter name="val"><paramtype>std::type_index</paramtype></parameter>
         </signature>
 
+        <signature>
+          <template>
+            <template-type-parameter name="T"/>
+            <template-nontype-parameter name="N">
+              <type>std::size_t</type>
+            </template-nontype-parameter>
+          </template>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::array&lt;T, N&gt; const&amp;</paramtype></parameter>
+        </signature>
+
+        <signature>
+          <template>
+            <template-type-parameter name="T" pack="1"/>
+          </template>
+          <type>std::size_t</type>
+          <parameter name="val"><paramtype>std::tuple&lt;T...&gt;</paramtype></parameter>
+        </signature>
+
         <description><para>
           Generally shouldn't be called directly by users, instead they should use
           <classname>boost::hash</classname>, <functionname>boost::hash_range</functionname>
@@ -809,7 +828,8 @@ for(; first != last; ++first)
                     <code>std::set&lt;K,&#160;C,&#160;A&gt;</code>,
                     <code>std::multiset&lt;K,&#160;C,&#160;A&gt;</code>,
                     <code>std::map&lt;K,&#160;T,&#160;C,&#160;A&gt;</code>,
-                    <code>std::multimap&lt;K,&#160;T,&#160;C,&#160;A&gt;</code>
+                    <code>std::multimap&lt;K,&#160;T,&#160;C,&#160;A&gt;</code>,
+                    <code>std::array&lt;T,&#160;N&gt;</code>
                   </entry>
                   <entry><code>hash_range(val.begin(), val.end())</code></entry>
                 </row>
@@ -818,6 +838,14 @@ for(; first != last; ++first)
                   <entry><programlisting>size_t seed = 0;
 <functionname>hash_combine</functionname>(seed, val.first);
 <functionname>hash_combine</functionname>(seed, val.second);
+return seed;</programlisting></entry>
+                </row>
+                <row>
+                  <entry><code>std::tuple&lt;T...&gt;</code></entry>
+                  <entry><programlisting>size_t seed = 0;
+<functionname>hash_combine</functionname>(seed, get&lt;0&gt;(val));
+<functionname>hash_combine</functionname>(seed, get&lt;1&gt;(val));
+// ....
 return seed;</programlisting></entry>
                 </row>
                 <row>
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 7b3ccd9..af24329 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -10,8 +10,8 @@ project hash-tests
         <warnings>all
         <toolset>intel:<warnings>on
         <toolset>intel:<cxxflags>-strict-ansi
-        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
-        <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
+        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal"
+        <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal"
         <toolset>msvc:<warnings-as-errors>on
         #<toolset>gcc:<warnings-as-errors>on
         #<toolset>darwin:<warnings-as-errors>on
@@ -40,6 +40,8 @@ test-suite functional/hash
         [ run hash_map_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
         [ run hash_complex_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
         [ run hash_type_index_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_std_array_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_std_tuple_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
         [ run link_test.cpp link_test_2.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
         [ run link_ext_test.cpp link_no_ext_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
         [ run extensions_hpp_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
index 67e2aff..bb1592c 100644
--- a/hash/test/hash_complex_test.cpp
+++ b/hash/test/hash_complex_test.cpp
@@ -35,6 +35,10 @@ int main() {}
 #endif
 #endif
 
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
 #include <complex>
 #include <sstream>
 #include <boost/limits.hpp>
diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
index dd1358e..c608915 100644
--- a/hash/test/hash_float_test.hpp
+++ b/hash/test/hash_float_test.hpp
@@ -30,6 +30,10 @@
 #endif
 #endif
 
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
 char const* float_type(float*) { return "float"; }
 char const* float_type(double*) { return "double"; }
 char const* float_type(long double*) { return "long double"; }
diff --git a/hash/test/hash_map_test.cpp b/hash/test/hash_map_test.cpp
index 2f813c3..7e117c7 100644
--- a/hash/test/hash_map_test.cpp
+++ b/hash/test/hash_map_test.cpp
@@ -27,7 +27,7 @@ using std::multimap;
 #define CONTAINER_TYPE multimap
 #include "./hash_map_test.hpp"
 
-#endif // TEST_EXTENSTIONS
+#endif // TEST_EXTENSIONS
 
 int main()
 {
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index b989d22..b233c71 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -28,6 +28,10 @@
 #pragma warning(disable:4310) // cast truncates constant value
 #endif
 
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
 template <class T>
 void numeric_test(T*)
 {
diff --git a/hash/test/hash_std_array_test.cpp b/hash/test/hash_std_array_test.cpp
new file mode 100644
index 0000000..540b676
--- /dev/null
+++ b/hash/test/hash_std_array_test.cpp
@@ -0,0 +1,103 @@
+
+// Copyright 2012 Daniel James.
+// Distributed under 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)
+
+#include "./config.hpp"
+
+#ifdef TEST_EXTENSIONS
+#  ifdef TEST_STD_INCLUDES
+#    include <functional>
+#  else
+#    include <boost/functional/hash.hpp>
+#  endif
+#endif
+
+#include <boost/config.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_0X_HDR_ARRAY)
+#define TEST_ARRAY
+#include <array>
+#include <vector>
+#endif
+
+#ifdef TEST_ARRAY
+
+template <typename T>
+void array_tests(T const& v) {
+    boost::hash<typename T::value_type> hf;
+    for(typename T::const_iterator i = v.begin(); i != v.end(); ++i) {
+        for(typename T::const_iterator j = v.begin(); j != v.end(); ++j) {
+            if (i != j)
+                BOOST_TEST(hf(*i) != hf(*j));
+            else
+                BOOST_TEST(hf(*i) == hf(*j));
+        }
+    }
+}
+
+void empty_array_test() {
+/*
+    boost::hash<std::array<int, 0> > empty_array_hash;
+    std::array<int, 0> empty_array;
+    BOOST_TEST(empty_array_hash(empty_array) == boost::hash_value(empty_array));
+*/
+}
+
+void int_1_array_test()
+{
+    std::vector<std::array<int, 1> > arrays;
+    std::array<int, 1> val;
+    val[0] = 0;
+    arrays.push_back(val);
+    val[0] = 1;
+    arrays.push_back(val);
+    val[0] = 2;
+    arrays.push_back(val);
+    array_tests(arrays);
+}
+
+void string_1_array_test()
+{
+    std::vector<std::array<std::string, 1> > arrays;
+    std::array<std::string, 1> val;
+    arrays.push_back(val);
+    val[0] = "one";
+    arrays.push_back(val);
+    val[0] = "two";
+    arrays.push_back(val);
+    array_tests(arrays);
+}
+
+void string_3_array_test()
+{
+    std::vector<std::array<std::string,3 > > arrays;
+    std::array<std::string, 3> val;
+    arrays.push_back(val);
+    val[0] = "one";
+    arrays.push_back(val);
+    val[0] = ""; val[1] = "one"; val[2] = "";
+    arrays.push_back(val);
+    val[0] = ""; val[1] = ""; val[2] = "one";
+    arrays.push_back(val);
+    val[0] = "one"; val[1] = "one"; val[2] = "one";
+    arrays.push_back(val);
+    val[0] = "one"; val[1] = "two"; val[2] = "three";
+    arrays.push_back(val);
+    array_tests(arrays);
+}
+
+#endif // TEST_ARRAY
+
+int main()
+{
+#ifdef TEST_ARRAY
+    empty_array_test();
+    int_1_array_test();
+    string_1_array_test();
+    string_3_array_test();
+#endif
+
+    return boost::report_errors();
+}
diff --git a/hash/test/hash_std_tuple_test.cpp b/hash/test/hash_std_tuple_test.cpp
new file mode 100644
index 0000000..15ef483
--- /dev/null
+++ b/hash/test/hash_std_tuple_test.cpp
@@ -0,0 +1,77 @@
+
+// Copyright 2012 Daniel James.
+// Distributed under 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)
+
+#include "./config.hpp"
+
+#ifdef TEST_EXTENSIONS
+#  ifdef TEST_STD_INCLUDES
+#    include <functional>
+#  else
+#    include <boost/functional/hash.hpp>
+#  endif
+#endif
+
+#include <boost/config.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_0X_HDR_TUPLE)
+#define TEST_TUPLE
+#include <tuple>
+#include <vector>
+#endif
+
+#ifdef TEST_TUPLE
+
+template <typename T>
+void tuple_tests(T const& v) {
+    boost::hash<typename T::value_type> hf;
+    for(typename T::const_iterator i = v.begin(); i != v.end(); ++i) {
+        for(typename T::const_iterator j = v.begin(); j != v.end(); ++j) {
+            if (i != j)
+                BOOST_TEST(hf(*i) != hf(*j));
+            else
+                BOOST_TEST(hf(*i) == hf(*j));
+        }
+    }
+}
+
+void empty_tuple_test() {
+    boost::hash<std::tuple<> > empty_tuple_hash;
+    std::tuple<> empty_tuple;
+    BOOST_TEST(empty_tuple_hash(empty_tuple) == boost::hash_value(empty_tuple));
+}
+
+void int_tuple_test() {
+    std::vector<std::tuple<int> > int_tuples;
+    int_tuples.push_back(std::make_tuple(0));
+    int_tuples.push_back(std::make_tuple(1));
+    int_tuples.push_back(std::make_tuple(2));
+    tuple_tests(int_tuples);
+}
+
+void int_string_tuple_test() {
+    std::vector<std::tuple<int, std::string> > int_string_tuples;
+    int_string_tuples.push_back(std::make_tuple(0, std::string("zero")));
+    int_string_tuples.push_back(std::make_tuple(1, std::string("one")));
+    int_string_tuples.push_back(std::make_tuple(2, std::string("two")));
+    int_string_tuples.push_back(std::make_tuple(0, std::string("one")));
+    int_string_tuples.push_back(std::make_tuple(1, std::string("zero")));
+    int_string_tuples.push_back(std::make_tuple(0, std::string("")));
+    int_string_tuples.push_back(std::make_tuple(1, std::string("")));
+    tuple_tests(int_string_tuples);
+}
+
+#endif // TEST_TUPLE
+
+int main()
+{
+#ifdef TEST_TUPLE
+    empty_tuple_test();
+    int_tuple_test();
+    int_string_tuple_test();
+#endif
+
+    return boost::report_errors();
+}
diff --git a/include/boost/functional/hash/detail/container_fwd_0x.hpp b/include/boost/functional/hash/detail/container_fwd_0x.hpp
new file mode 100644
index 0000000..566f2af
--- /dev/null
+++ b/include/boost/functional/hash/detail/container_fwd_0x.hpp
@@ -0,0 +1,41 @@
+
+// Copyright 2012 Daniel James.
+// Distributed under 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)
+
+#if !defined(BOOST_DETAIL_CONTAINER_FWD_0X_HPP)
+#define BOOST_DETAIL_CONTAINER_FWD_0X_HPP
+
+#include <boost/detail/container_fwd.hpp>
+
+// std::array
+
+#if !defined(BOOST_NO_0X_HDR_ARRAY)
+    // Don't forward declare std::array for Dinkumware, as it seems to be
+    // just 'using std::tr1::array'.
+#   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
+        !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)) || \
+        (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
+#       include <array>
+#    else
+namespace std {
+    template <class, std::size_t> class array;
+}
+#    endif
+#endif
+
+// std::tuple
+
+#if !defined(BOOST_NO_0X_HDR_TUPLE)
+#   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
+        !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)) || \
+        defined(BOOST_NO_VARIADIC_TEMPLATES)
+#       include <tuple>
+#    else
+namespace std {
+    template <typename...> class tuple;
+}
+#    endif
+#endif
+
+#endif
diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/functional/hash/detail/hash_float.hpp
index ea1bc25..194be1c 100644
--- a/include/boost/functional/hash/detail/hash_float.hpp
+++ b/include/boost/functional/hash/detail/hash_float.hpp
@@ -86,10 +86,24 @@ namespace boost
 {
     namespace hash_detail
     {
+        template <class T>
+        inline bool is_zero(T v)
+        {
+#if !defined(__GNUC__)
+            return v == 0;
+#else
+            // GCC's '-Wfloat-equal' will complain about comparing
+            // v to 0, but because it disables warnings for system
+            // headers it won't complain if you use std::equal_to to
+            // compare with 0. Resulting in this silliness:
+            return std::equal_to<T>()(v, 0);
+#endif
+        }
+
         template <class T>
         inline std::size_t float_hash_value(T v)
         {
-            return v == 0 ? 0 : float_hash_impl(v);
+            return boost::hash_detail::is_zero(v) ? 0 : float_hash_impl(v);
         }
     }
 }
diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp
index 3c587a3..e61c2f3 100644
--- a/include/boost/functional/hash/extensions.hpp
+++ b/include/boost/functional/hash/extensions.hpp
@@ -14,7 +14,11 @@
 #define BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP
 
 #include <boost/functional/hash/hash.hpp>
-#include <boost/detail/container_fwd.hpp>
+#include <boost/functional/hash/detail/container_fwd_0x.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/preprocessor/repetition/repeat_from_to.hpp>
+#include <boost/preprocessor/repetition/enum_params.hpp>
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
@@ -54,51 +58,51 @@ namespace boost
     std::size_t hash_value(std::pair<A, B> const& v)
     {
         std::size_t seed = 0;
-        hash_combine(seed, v.first);
-        hash_combine(seed, v.second);
+        boost::hash_combine(seed, v.first);
+        boost::hash_combine(seed, v.second);
         return seed;
     }
 
     template <class T, class A>
     std::size_t hash_value(std::vector<T, A> const& v)
     {
-        return hash_range(v.begin(), v.end());
+        return boost::hash_range(v.begin(), v.end());
     }
 
     template <class T, class A>
     std::size_t hash_value(std::list<T, A> const& v)
     {
-        return hash_range(v.begin(), v.end());
+        return boost::hash_range(v.begin(), v.end());
     }
 
     template <class T, class A>
     std::size_t hash_value(std::deque<T, A> const& v)
     {
-        return hash_range(v.begin(), v.end());
+        return boost::hash_range(v.begin(), v.end());
     }
 
     template <class K, class C, class A>
     std::size_t hash_value(std::set<K, C, A> const& v)
     {
-        return hash_range(v.begin(), v.end());
+        return boost::hash_range(v.begin(), v.end());
     }
 
     template <class K, class C, class A>
     std::size_t hash_value(std::multiset<K, C, A> const& v)
     {
-        return hash_range(v.begin(), v.end());
+        return boost::hash_range(v.begin(), v.end());
     }
 
     template <class K, class T, class C, class A>
     std::size_t hash_value(std::map<K, T, C, A> const& v)
     {
-        return hash_range(v.begin(), v.end());
+        return boost::hash_range(v.begin(), v.end());
     }
 
     template <class K, class T, class C, class A>
     std::size_t hash_value(std::multimap<K, T, C, A> const& v)
     {
-        return hash_range(v.begin(), v.end());
+        return boost::hash_range(v.begin(), v.end());
     }
 
     template <class T>
@@ -110,6 +114,71 @@ namespace boost
         return seed;
     }
 
+#if !defined(BOOST_NO_0X_HDR_ARRAY)
+    template <class T, std::size_t N>
+    std::size_t hash_value(std::array<T, N> const& v)
+    {
+        return boost::hash_range(v.begin(), v.end());
+    }
+#endif
+
+#if !defined(BOOST_NO_0X_HDR_TUPLE)
+    namespace hash_detail {
+        template <std::size_t I, typename T>
+        inline typename boost::enable_if_c<(I == std::tuple_size<T>::value),
+                void>::type
+            hash_combine_tuple(std::size_t&, T const&)
+        {
+        }
+
+        template <std::size_t I, typename T>
+        inline typename boost::enable_if_c<(I < std::tuple_size<T>::value),
+                void>::type
+            hash_combine_tuple(std::size_t& seed, T const& v)
+        {
+            boost::hash_combine(seed, std::get<I>(v));
+            boost::hash_detail::hash_combine_tuple<I + 1>(seed, v);
+        }
+
+        template <typename T>
+        inline std::size_t hash_tuple(T const& v)
+        {
+            std::size_t seed = 0;
+            boost::hash_detail::hash_combine_tuple<0>(seed, v);
+            return seed;
+        }
+    }
+
+#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+    template <typename... T>
+    inline std::size_t hash_value(std::tuple<T...> const& v)
+    {
+        return boost::hash_detail::hash_tuple(v);
+    }
+#else
+
+    inline std::size_t hash_value(std::tuple<> const& v)
+    {
+        return boost::hash_detail::hash_tuple(v);
+    }
+
+#   define BOOST_HASH_TUPLE_F(z, n, _)                                      \
+    template<                                                               \
+        BOOST_PP_ENUM_PARAMS_Z(z, n, typename A)                            \
+    >                                                                       \
+    inline std::size_t hash_value(std::tuple<                               \
+        BOOST_PP_ENUM_PARAMS_Z(z, n, A)                                     \
+    > const& v)                                                             \
+    {                                                                       \
+        return boost::hash_detail::hash_tuple(v);                           \
+    }
+
+    BOOST_PP_REPEAT_FROM_TO(1, 11, BOOST_HASH_TUPLE_F, _)
+#   undef BOOST_HASH_TUPLE_F
+#endif
+
+#endif
+
     //
     // call_hash_impl
     //

From 1ad77fa8bab8d4c546817f22c718571f6edb5660 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 12 May 2012 08:14:05 +0000
Subject: [PATCH 085/111] Unordered: Merge unordered from trunk.

- Activate `std::allocator_traits` for gcc 4.7 and Visual C++ 11.
- Implement variadic construct in `boost::unordered::detail::allocator_traits`
  when variadics, rvalue references and SFINAE expression are available.
- Use variadic construct from `allocator_traits`, or when not available move
  the logic for constructing `value_type` to a lower level, so the container
  code is a bit simpler.
- Avoid `-Wshadow` warnings. Fixes #6190.
- Implement `reserve`. Fixes #6857.


[SVN r78432]
---
 hash/test/Jamfile.v2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index af24329..2d1a527 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -10,8 +10,8 @@ project hash-tests
         <warnings>all
         <toolset>intel:<warnings>on
         <toolset>intel:<cxxflags>-strict-ansi
-        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal"
-        <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal"
+        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
+        <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
         <toolset>msvc:<warnings-as-errors>on
         #<toolset>gcc:<warnings-as-errors>on
         #<toolset>darwin:<warnings-as-errors>on

From 9d67f4ccd3052e1c8caaec1efd7c52cccee6eb77 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 27 May 2012 21:13:49 +0000
Subject: [PATCH 086/111] Hash: Merge deprecated header warning + some
 documentation.

[SVN r78697]
---
 hash/doc/changes.qbk                          |  2 ++
 hash/doc/ref.xml                              | 17 +++++++--
 hash/doc/tutorial.qbk                         | 12 ++++++-
 hash/examples/Jamfile.v2                      |  1 +
 hash/examples/template.cpp                    | 18 ++++++++++
 hash/examples/template.hpp                    | 36 +++++++++++++++++++
 hash/test/Jamfile.v2                          |  1 +
 hash/test/deprecated_container_fwd.cpp        | 14 ++++++++
 .../boost/functional/detail/container_fwd.hpp | 14 ++++++--
 9 files changed, 108 insertions(+), 7 deletions(-)
 create mode 100644 hash/examples/template.cpp
 create mode 100644 hash/examples/template.hpp
 create mode 100644 hash/test/deprecated_container_fwd.cpp

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index c47bd56..3aa3dee 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -129,5 +129,7 @@
   Avoid gcc's `-Wfloat-equal` warning.
 * [@http://svn.boost.org/trac/boost/ticket/6806 Ticket 6806]:
   Support `std::array` and `std::tuple` when available.
+* Add deprecation warning to the long deprecated
+  `boost/functional/detail/container_fwd.hpp`.
 
 [endsect]
diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml
index fa29fcd..d7c427c 100644
--- a/hash/doc/ref.xml
+++ b/hash/doc/ref.xml
@@ -55,6 +55,10 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
               is defined. The specializations are still defined, so only the specializations
               required by TR1 are defined.
             </para>
+            <para>
+              Forward declared in
+              <code>&lt;boost/functional/hash_fwd.hpp&gt;</code>
+            </para>
           </notes>
           <throws><para>
             Only throws if
@@ -451,6 +455,10 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
           <para><functionname>hash_value</functionname> is called without
           qualification, so that overloads can be found via ADL.</para>
           <para>This is an extension to TR1</para>
+          <para>
+            Forward declared in
+            <code>&lt;boost/functional/hash_fwd.hpp&gt;</code>
+          </para>
         </notes>
         <throws>
           Only throws if <functionname>hash_value</functionname>(T) throws.
@@ -499,15 +507,14 @@ for(; first != last; ++first)
 
 return seed;
 </programlisting>
-          </para>For the three arguments overload:
+          </para>
+          <para>For the three arguments overload:</para>
 <programlisting>
 for(; first != last; ++first)
 {
     <functionname>hash_combine</functionname>(seed, *first);
 }
 </programlisting>
-          <para>
-          </para>
         </effects>
         <notes>
           <para>
@@ -516,6 +523,10 @@ for(; first != last; ++first)
             container.
           </para>
           <para>This is an extension to TR1</para>
+          <para>
+            Forward declared in
+            <code>&lt;boost/functional/hash_fwd.hpp&gt;</code>
+          </para>
         </notes>
         <throws><para>
           Only throws if <code><functionname>hash_value</functionname>(std::iterator_traits&lt;It&gt;::value_type)</code>
diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index 81c1b15..916ab93 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -198,5 +198,15 @@ To calculate the hash of an iterator range you can use [funcref boost::hash_rang
     std::vector<std::string> some_strings;
     std::size_t hash = ``[funcref boost::hash_range]``(some_strings.begin(), some_strings.end());
 
-[endsect]
+Note that when writing template classes, you might not want to include the main
+hash header as it's quite an expensive include that brings in a lot of other
+headers, so instead you can include the `<boost/functional/hash_fwd.hpp>`
+header which forward declares [classref boost::hash],
+[funcref boost::hash_range] and [funcref boost::hash_combine]. You'll need to
+include the main header before instantiating [classref boost::hash]. When using
+a container that uses [classref boost::hash] it should do that for you, so your
+type will work fine with the boost hash containers. There's an example of this
+in [@boost:/libs/unordered/examples/template.hpp template.hpp] and
+[@boost:/libs/unordered/examples/template.cpp template.cpp].
 
+[endsect]
diff --git a/hash/examples/Jamfile.v2 b/hash/examples/Jamfile.v2
index dc5bdce..6291621 100644
--- a/hash/examples/Jamfile.v2
+++ b/hash/examples/Jamfile.v2
@@ -6,3 +6,4 @@
 run books.cpp ;
 run point.cpp ;
 run portable.cpp ;
+run template.cpp ;
diff --git a/hash/examples/template.cpp b/hash/examples/template.cpp
new file mode 100644
index 0000000..d74f0a9
--- /dev/null
+++ b/hash/examples/template.cpp
@@ -0,0 +1,18 @@
+
+// Copyright 2012 Daniel James.
+// Distributed under 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)
+
+#include "template.hpp"
+#include <cassert>
+#include <boost/unordered_set.hpp>
+
+int main()
+{
+    typedef my_pair<int, float> pair;
+    boost::unordered_set<pair> pair_set;
+    pair_set.emplace(10, 0.5f);
+
+    assert(pair_set.find(pair(10, 0.5f)) != pair_set.end());
+    assert(pair_set.find(pair(10, 0.6f)) == pair_set.end());
+}
diff --git a/hash/examples/template.hpp b/hash/examples/template.hpp
new file mode 100644
index 0000000..b630704
--- /dev/null
+++ b/hash/examples/template.hpp
@@ -0,0 +1,36 @@
+
+// Copyright 2012 Daniel James.
+// Distributed under 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)
+
+// This is an example of how to write a hash function for a template
+// class.
+
+#include <boost/functional/hash_fwd.hpp>
+
+template <typename A, typename B>
+class my_pair
+{
+    A value1;
+    B value2;
+public:
+    my_pair(A const& v1, B const& v2)
+        : value1(v1), value2(v2)
+    {}
+
+    bool operator==(my_pair const& other) const
+    {
+        return value1 == other.value1 &&
+            value2 == other.value2;
+    }
+
+    friend std::size_t hash_value(my_pair const& p)
+    {
+        std::size_t seed = 0;
+        boost::hash_combine(seed, p.value1);
+        boost::hash_combine(seed, p.value2);
+
+        return seed;
+    }
+};
+
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 2d1a527..77ac13f 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -50,6 +50,7 @@ test-suite functional/hash
         [ compile-fail implicit_fail_test.cpp : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
         [ run hash_no_ext_macro_1.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
         [ run hash_no_ext_macro_2.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ compile deprecated_container_fwd.cpp ]
     ;
 
 test-suite functional/hash_implicit_casts
diff --git a/hash/test/deprecated_container_fwd.cpp b/hash/test/deprecated_container_fwd.cpp
new file mode 100644
index 0000000..1c6e12b
--- /dev/null
+++ b/hash/test/deprecated_container_fwd.cpp
@@ -0,0 +1,14 @@
+
+// Copyright 2012 Daniel James.
+// Distributed under 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)
+
+#include <boost/functional/detail/container_fwd.hpp>
+
+typedef std::vector<int, std::allocator<int> > int_vector;
+
+#include <vector>
+
+int main() {
+    int_vector x;
+}
diff --git a/include/boost/functional/detail/container_fwd.hpp b/include/boost/functional/detail/container_fwd.hpp
index 9a69d15..e2bf865 100644
--- a/include/boost/functional/detail/container_fwd.hpp
+++ b/include/boost/functional/detail/container_fwd.hpp
@@ -1,11 +1,11 @@
 
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2012 Daniel James.
 // Distributed under 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)
 
 // Forwarding header for container_fwd.hpp's new location.
-// This header is deprecated, I'll be adding a warning in a future release,
-// then converting it to an error and finally removing this header completely.
+// This header is deprecated, I'll change the warning to an error in a future
+// release, and then later remove the header completely.
 
 #if !defined(BOOST_FUNCTIONAL_DETAIL_CONTAINER_FWD_HPP)
 #define BOOST_FUNCTIONAL_DETAIL_CONTAINER_FWD_HPP
@@ -14,6 +14,14 @@
 # pragma once
 #endif
 
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+#pragma message("Warning: boost/functional/detail/container_fwd.hpp is deprecated, use boost/detail/container_fwd.hpp instead.")
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
+#warning "boost/functional/detail/container_fwd.hpp is deprecated, use boost/detail/container_fwd.hpp instead."
+#endif
+
 #include <boost/detail/container_fwd.hpp>
 
 #endif

From 84853384e6437de223f1289fd8b3c591f0187682 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Thu, 7 Jun 2012 16:47:33 +0000
Subject: [PATCH 087/111] Update Jamfiles and build scripts for PDF generation.
 Set local_function image DPI's for better PDF builds.

[SVN r78849]
---
 overloaded_function/doc/Jamfile.v2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/overloaded_function/doc/Jamfile.v2 b/overloaded_function/doc/Jamfile.v2
index 1cfbc8e..33182da 100644
--- a/overloaded_function/doc/Jamfile.v2
+++ b/overloaded_function/doc/Jamfile.v2
@@ -28,3 +28,7 @@ boostbook doc : qbk
         <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/functional/overloaded_function/doc/html
     ;
 
+install pdf-install : doc : <location>. <install-type>PDF <name>overloaded_function.pdf ;
+
+
+

From c83c1a9b00bc898ec2a8ea5e54e240039e1dc892 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 7 Jun 2012 19:50:10 +0000
Subject: [PATCH 088/111] Hash: Merge test fix.

[SVN r78854]
---
 hash/test/hash_type_index_test.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hash/test/hash_type_index_test.cpp b/hash/test/hash_type_index_test.cpp
index 7892918..917bca9 100644
--- a/hash/test/hash_type_index_test.cpp
+++ b/hash/test/hash_type_index_test.cpp
@@ -18,12 +18,16 @@
 #include <typeindex>
 
 void test_type_index() {
+    HASH_NAMESPACE::hash<std::type_index> hasher;
+
+#if defined(BOOST_NO_TYPEID)
+    std::cout<<"Unable to test std::type_index, as typeid isn't available"
+        <<std::endl;
+#else
     std::type_index int_index = typeid(int);
     std::type_index int2_index = typeid(int);
     std::type_index char_index = typeid(char);
     
-    HASH_NAMESPACE::hash<std::type_index> hasher;
-    
     BOOST_TEST(hasher(int_index) == int_index.hash_code());
     BOOST_TEST(hasher(int_index) == int2_index.hash_code());
     BOOST_TEST(hasher(char_index) == char_index.hash_code());
@@ -33,6 +37,7 @@ void test_type_index() {
 
     BOOST_TEST(hasher(int_index) == hasher(int2_index));
     BOOST_TEST(hasher(int_index) != hasher(char_index));
+#endif
 }
 #endif
 

From 192b394d137b697434a2e1855a597051a69efe87 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 11 Jun 2012 07:23:17 +0000
Subject: [PATCH 089/111] Merge documentation build fix from trunk.

[SVN r78888]
---
 overloaded_function/doc/Jamfile.v2 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/overloaded_function/doc/Jamfile.v2 b/overloaded_function/doc/Jamfile.v2
index 33182da..a728e83 100644
--- a/overloaded_function/doc/Jamfile.v2
+++ b/overloaded_function/doc/Jamfile.v2
@@ -29,6 +29,4 @@ boostbook doc : qbk
     ;
 
 install pdf-install : doc : <location>. <install-type>PDF <name>overloaded_function.pdf ;
-
-
-
+explicit pdf-install ;

From be710a76bec50d4cf0777d968ebc8da37e1a8136 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 9 Jul 2012 20:53:36 +0000
Subject: [PATCH 090/111] Hash: Merge using SFINAE to avoid implicit casts.

[SVN r79394]
---
 hash/test/Jamfile.v2                          |  76 ++++-----
 ...plicit_fail_test.cpp => implicit_test.cpp} |   0
 include/boost/functional/hash/hash.hpp        | 160 +++++++-----------
 3 files changed, 91 insertions(+), 145 deletions(-)
 rename hash/test/{implicit_fail_test.cpp => implicit_test.cpp} (100%)

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 77ac13f..47f0a95 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -19,54 +19,40 @@ project hash-tests
 
 test-suite functional/hash
     :
-        [ run hash_fwd_test_1.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_fwd_test_2.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_number_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_pointer_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_function_pointer_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_float_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_long_double_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_string_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_range_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_custom_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_global_namespace_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_friend_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_built_in_array_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_value_array_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_vector_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_list_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_deque_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_set_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_map_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_complex_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_type_index_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_std_array_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_std_tuple_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run link_test.cpp link_test_2.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run link_ext_test.cpp link_no_ext_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run extensions_hpp_test.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ compile-fail hash_no_ext_fail_test.cpp : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ compile-fail namespace_fail_test.cpp : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ compile-fail implicit_fail_test.cpp : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_no_ext_macro_1.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
-        [ run hash_no_ext_macro_2.cpp : : : <define>BOOST_HASH_NO_IMPLICIT_CASTS ]
+        [ run hash_fwd_test_1.cpp ]
+        [ run hash_fwd_test_2.cpp ]
+        [ run hash_number_test.cpp ]
+        [ run hash_pointer_test.cpp ]
+        [ run hash_function_pointer_test.cpp ]
+        [ run hash_float_test.cpp ]
+        [ run hash_long_double_test.cpp ]
+        [ run hash_string_test.cpp ]
+        [ run hash_range_test.cpp ]
+        [ run hash_custom_test.cpp ]
+        [ run hash_global_namespace_test.cpp ]
+        [ run hash_friend_test.cpp ]
+        [ run hash_built_in_array_test.cpp ]
+        [ run hash_value_array_test.cpp ]
+        [ run hash_vector_test.cpp ]
+        [ run hash_list_test.cpp ]
+        [ run hash_deque_test.cpp ]
+        [ run hash_set_test.cpp ]
+        [ run hash_map_test.cpp ]
+        [ run hash_complex_test.cpp ]
+        [ run hash_type_index_test.cpp ]
+        [ run hash_std_array_test.cpp ]
+        [ run hash_std_tuple_test.cpp ]
+        [ run link_test.cpp link_test_2.cpp ]
+        [ run link_ext_test.cpp link_no_ext_test.cpp ]
+        [ run extensions_hpp_test.cpp ]
+        [ compile-fail hash_no_ext_fail_test.cpp ]
+        [ compile-fail namespace_fail_test.cpp ]
+        [ run implicit_test.cpp ]
+        [ run hash_no_ext_macro_1.cpp ]
+        [ run hash_no_ext_macro_2.cpp ]
         [ compile deprecated_container_fwd.cpp ]
     ;
 
-test-suite functional/hash_implicit_casts
-    :
-        [ run hash_number_test.cpp : : : : implicit_number ]
-        [ run hash_pointer_test.cpp : : : : implicit_pointer ]
-        [ run hash_function_pointer_test.cpp : : : : implicit_function_pointer ]
-        [ run hash_float_test.cpp : : : : implicit_float ]
-        [ run hash_string_test.cpp : : : : implicit_string ]
-        [ run hash_range_test.cpp : : : : implicit_range ]
-        [ run hash_custom_test.cpp : : : : implicit_custom ]
-        [ run hash_built_in_array_test.cpp : : : : implicit_built_in_array ]
-        [ run link_test.cpp link_test_2.cpp : : : : implicit_link ]
-        [ run implicit_fail_test.cpp : : : : implicit_test ]
-    ;
-
 test-suite functional/hash_no_ext
     :
         [ run hash_number_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_number_test ]
diff --git a/hash/test/implicit_fail_test.cpp b/hash/test/implicit_test.cpp
similarity index 100%
rename from hash/test/implicit_fail_test.cpp
rename to hash/test/implicit_test.cpp
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 51ec860..7559e56 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -16,10 +16,6 @@
 #include <string>
 #include <boost/limits.hpp>
 
-#if defined(BOOST_HASH_NO_IMPLICIT_CASTS)
-#include <boost/static_assert.hpp>
-#endif
-
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 #include <boost/type_traits/is_pointer.hpp>
 #endif
@@ -37,38 +33,63 @@
 
 namespace boost
 {
-#if defined(BOOST_HASH_NO_IMPLICIT_CASTS)
+    namespace hash_detail
+    {
+        struct enable_hash_value { typedef std::size_t type; };
 
-    // If you get a static assertion here, it's because hash_value
-    // isn't declared for your type.
-    template <typename T>
-    std::size_t hash_value(T const&) {
-        BOOST_STATIC_ASSERT((T*) 0 && false);
-        return 0;
-    }
+        template <typename T> struct basic_numbers {};
+        template <typename T> struct long_numbers {};
+        template <typename T> struct ulong_numbers {};
+        template <typename T> struct float_numbers {};
 
-#endif
-
-    std::size_t hash_value(bool);
-    std::size_t hash_value(char);
-    std::size_t hash_value(unsigned char);
-    std::size_t hash_value(signed char);
-    std::size_t hash_value(short);
-    std::size_t hash_value(unsigned short);
-    std::size_t hash_value(int);
-    std::size_t hash_value(unsigned int);
-    std::size_t hash_value(long);
-    std::size_t hash_value(unsigned long);
+        template <> struct basic_numbers<bool> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct basic_numbers<char> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct basic_numbers<unsigned char> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct basic_numbers<signed char> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct basic_numbers<short> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct basic_numbers<unsigned short> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct basic_numbers<int> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct basic_numbers<unsigned int> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct basic_numbers<long> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct basic_numbers<unsigned long> :
+            boost::hash_detail::enable_hash_value {};
 
 #if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
-    std::size_t hash_value(wchar_t);
+        template <> struct basic_numbers<wchar_t> :
+            boost::hash_detail::enable_hash_value {};
 #endif
-    
+
 #if !defined(BOOST_NO_LONG_LONG)
-    std::size_t hash_value(boost::long_long_type);
-    std::size_t hash_value(boost::ulong_long_type);
+        template <> struct long_numbers<boost::long_long_type> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct ulong_numbers<boost::ulong_long_type> :
+            boost::hash_detail::enable_hash_value {};
 #endif
 
+        template <> struct float_numbers<float> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct float_numbers<double> :
+            boost::hash_detail::enable_hash_value {};
+        template <> struct float_numbers<long double> :
+            boost::hash_detail::enable_hash_value {};
+    }
+
+    template <typename T>
+    typename boost::hash_detail::basic_numbers<T>::type hash_value(T);
+    template <typename T>
+    typename boost::hash_detail::long_numbers<T>::type hash_value(T);
+    template <typename T>
+    typename boost::hash_detail::ulong_numbers<T>::type hash_value(T);
+
 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
     template <class T> std::size_t hash_value(T* const&);
 #else
@@ -83,14 +104,13 @@ namespace boost
     std::size_t hash_value(T (&x)[N]);
 #endif
 
-    std::size_t hash_value(float v);
-    std::size_t hash_value(double v);
-    std::size_t hash_value(long double v);
-
     template <class Ch, class A>
     std::size_t hash_value(
         std::basic_string<Ch, std::BOOST_HASH_CHAR_TRAITS<Ch>, A> const&);
 
+    template <typename T>
+    typename boost::hash_detail::float_numbers<T>::type hash_value(T);
+
 #if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
     std::size_t hash_value(std::type_index);
 #endif
@@ -141,74 +161,23 @@ namespace boost
         }
     }
 
-    inline std::size_t hash_value(bool v)
+    template <typename T>
+    typename boost::hash_detail::basic_numbers<T>::type hash_value(T v)
     {
         return static_cast<std::size_t>(v);
     }
 
-    inline std::size_t hash_value(char v)
-    {
-        return static_cast<std::size_t>(v);
-    }
-
-    inline std::size_t hash_value(unsigned char v)
-    {
-        return static_cast<std::size_t>(v);
-    }
-
-    inline std::size_t hash_value(signed char v)
-    {
-        return static_cast<std::size_t>(v);
-    }
-
-    inline std::size_t hash_value(short v)
-    {
-        return static_cast<std::size_t>(v);
-    }
-
-    inline std::size_t hash_value(unsigned short v)
-    {
-        return static_cast<std::size_t>(v);
-    }
-
-    inline std::size_t hash_value(int v)
-    {
-        return static_cast<std::size_t>(v);
-    }
-
-    inline std::size_t hash_value(unsigned int v)
-    {
-        return static_cast<std::size_t>(v);
-    }
-
-    inline std::size_t hash_value(long v)
-    {
-        return static_cast<std::size_t>(v);
-    }
-
-    inline std::size_t hash_value(unsigned long v)
-    {
-        return static_cast<std::size_t>(v);
-    }
-
-#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
-    inline std::size_t hash_value(wchar_t v)
-    {
-        return static_cast<std::size_t>(v);
-    }
-#endif
-
-#if !defined(BOOST_NO_LONG_LONG)
-    inline std::size_t hash_value(boost::long_long_type v)
+    template <typename T>
+    typename boost::hash_detail::long_numbers<T>::type hash_value(T v)
     {
         return hash_detail::hash_value_signed(v);
     }
 
-    inline std::size_t hash_value(boost::ulong_long_type v)
+    template <typename T>
+    typename boost::hash_detail::ulong_numbers<T>::type hash_value(T v)
     {
         return hash_detail::hash_value_unsigned(v);
     }
-#endif
 
     // Implementation by Alberto Barbati and Dave Harris.
 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
@@ -324,17 +293,8 @@ namespace boost
         return hash_range(v.begin(), v.end());
     }
 
-    inline std::size_t hash_value(float v)
-    {
-        return boost::hash_detail::float_hash_value(v);
-    }
-
-    inline std::size_t hash_value(double v)
-    {
-        return boost::hash_detail::float_hash_value(v);
-    }
-
-    inline std::size_t hash_value(long double v)
+    template <typename T>
+    typename boost::hash_detail::float_numbers<T>::type hash_value(T v)
     {
         return boost::hash_detail::float_hash_value(v);
     }

From 67c6803f60bde5e7ffc62e3fcdf5c7c6a79489b2 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sat, 14 Jul 2012 16:05:50 +0000
Subject: [PATCH 091/111] Merge changes from trunk:

Fix PDF install rule so that it's explicit and automatically invokes a PDF build when specified on the command line.
So "bjam pdfinstall" will now build and install the PDF to the current directory.
This works around some problems that the previous versions had if the user did not have an FO processor installed (basically Daniel James was unable to build the HTML docs for the distribution if the pdfinstall rule was implicit).


[SVN r79500]
---
 overloaded_function/doc/Jamfile.v2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/overloaded_function/doc/Jamfile.v2 b/overloaded_function/doc/Jamfile.v2
index a728e83..04c13dd 100644
--- a/overloaded_function/doc/Jamfile.v2
+++ b/overloaded_function/doc/Jamfile.v2
@@ -28,5 +28,5 @@ boostbook doc : qbk
         <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/functional/overloaded_function/doc/html
     ;
 
-install pdf-install : doc : <location>. <install-type>PDF <name>overloaded_function.pdf ;
-explicit pdf-install ;
+install pdfinstall : doc/<format>pdf : <location>. <install-type>PDF <name>overloaded_function.pdf ;
+explicit pdfinstall ;

From 3306443ea8dde5a2e48870e0cf38f1b20fba86cc Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 15 Jul 2012 23:28:30 +0000
Subject: [PATCH 092/111] Hash: Merge update c++11 header macros.

[SVN r79544]
---
 hash/test/hash_std_array_test.cpp                         | 2 +-
 hash/test/hash_std_tuple_test.cpp                         | 2 +-
 hash/test/hash_type_index_test.cpp                        | 4 ++--
 include/boost/functional/hash/detail/container_fwd_0x.hpp | 4 ++--
 include/boost/functional/hash/extensions.hpp              | 4 ++--
 include/boost/functional/hash/hash.hpp                    | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hash/test/hash_std_array_test.cpp b/hash/test/hash_std_array_test.cpp
index 540b676..6f67a67 100644
--- a/hash/test/hash_std_array_test.cpp
+++ b/hash/test/hash_std_array_test.cpp
@@ -16,7 +16,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_0X_HDR_ARRAY)
+#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_ARRAY)
 #define TEST_ARRAY
 #include <array>
 #include <vector>
diff --git a/hash/test/hash_std_tuple_test.cpp b/hash/test/hash_std_tuple_test.cpp
index 15ef483..9314336 100644
--- a/hash/test/hash_std_tuple_test.cpp
+++ b/hash/test/hash_std_tuple_test.cpp
@@ -16,7 +16,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_0X_HDR_TUPLE)
+#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_TUPLE)
 #define TEST_TUPLE
 #include <tuple>
 #include <vector>
diff --git a/hash/test/hash_type_index_test.cpp b/hash/test/hash_type_index_test.cpp
index 917bca9..27fcfff 100644
--- a/hash/test/hash_type_index_test.cpp
+++ b/hash/test/hash_type_index_test.cpp
@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
 
 #include <typeindex>
 
@@ -43,7 +43,7 @@ void test_type_index() {
 
 int main()
 {
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
     test_type_index();
 #else
     std::cout<<"<type_index> not available."<<std::endl;
diff --git a/include/boost/functional/hash/detail/container_fwd_0x.hpp b/include/boost/functional/hash/detail/container_fwd_0x.hpp
index 566f2af..442ec6c 100644
--- a/include/boost/functional/hash/detail/container_fwd_0x.hpp
+++ b/include/boost/functional/hash/detail/container_fwd_0x.hpp
@@ -10,7 +10,7 @@
 
 // std::array
 
-#if !defined(BOOST_NO_0X_HDR_ARRAY)
+#if !defined(BOOST_NO_CXX11_HDR_ARRAY)
     // Don't forward declare std::array for Dinkumware, as it seems to be
     // just 'using std::tr1::array'.
 #   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
@@ -26,7 +26,7 @@ namespace std {
 
 // std::tuple
 
-#if !defined(BOOST_NO_0X_HDR_TUPLE)
+#if !defined(BOOST_NO_CXX11_HDR_TUPLE)
 #   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
         !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)) || \
         defined(BOOST_NO_VARIADIC_TEMPLATES)
diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp
index e61c2f3..9c4a6be 100644
--- a/include/boost/functional/hash/extensions.hpp
+++ b/include/boost/functional/hash/extensions.hpp
@@ -114,7 +114,7 @@ namespace boost
         return seed;
     }
 
-#if !defined(BOOST_NO_0X_HDR_ARRAY)
+#if !defined(BOOST_NO_CXX11_HDR_ARRAY)
     template <class T, std::size_t N>
     std::size_t hash_value(std::array<T, N> const& v)
     {
@@ -122,7 +122,7 @@ namespace boost
     }
 #endif
 
-#if !defined(BOOST_NO_0X_HDR_TUPLE)
+#if !defined(BOOST_NO_CXX11_HDR_TUPLE)
     namespace hash_detail {
         template <std::size_t I, typename T>
         inline typename boost::enable_if_c<(I == std::tuple_size<T>::value),
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 7559e56..c179fab 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -20,7 +20,7 @@
 #include <boost/type_traits/is_pointer.hpp>
 #endif
 
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
 #include <typeindex>
 #endif
 
@@ -111,7 +111,7 @@ namespace boost
     template <typename T>
     typename boost::hash_detail::float_numbers<T>::type hash_value(T);
 
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
     std::size_t hash_value(std::type_index);
 #endif
 
@@ -299,7 +299,7 @@ namespace boost
         return boost::hash_detail::float_hash_value(v);
     }
 
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
     inline std::size_t hash_value(std::type_index v)
     {
         return v.hash_code();
@@ -410,7 +410,7 @@ namespace boost
     BOOST_HASH_SPECIALIZE(boost::ulong_long_type)
 #endif
 
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
     BOOST_HASH_SPECIALIZE(std::type_index)
 #endif
 

From b528d3b1bfe2a10e13ebc37259baec3b395a80ba Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 16 Jul 2012 00:18:30 +0000
Subject: [PATCH 093/111] Hash: Merge support for smart pointers.

[SVN r79548]
---
 hash/test/Jamfile.v2                          |  1 +
 hash/test/hash_std_smart_ptr_test.cpp         | 80 +++++++++++++++++++
 .../hash/detail/container_fwd_0x.hpp          | 14 ++++
 include/boost/functional/hash/extensions.hpp  | 12 +++
 4 files changed, 107 insertions(+)
 create mode 100644 hash/test/hash_std_smart_ptr_test.cpp

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 47f0a95..fc731d2 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -42,6 +42,7 @@ test-suite functional/hash
         [ run hash_type_index_test.cpp ]
         [ run hash_std_array_test.cpp ]
         [ run hash_std_tuple_test.cpp ]
+        [ run hash_std_smart_ptr_test.cpp ]
         [ run link_test.cpp link_test_2.cpp ]
         [ run link_ext_test.cpp link_no_ext_test.cpp ]
         [ run extensions_hpp_test.cpp ]
diff --git a/hash/test/hash_std_smart_ptr_test.cpp b/hash/test/hash_std_smart_ptr_test.cpp
new file mode 100644
index 0000000..7452585
--- /dev/null
+++ b/hash/test/hash_std_smart_ptr_test.cpp
@@ -0,0 +1,80 @@
+
+// Copyright 2012 Daniel James.
+// Distributed under 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)
+
+#include "./config.hpp"
+
+#ifdef TEST_STD_INCLUDES
+#  include <functional>
+#else
+#  include <boost/functional/hash.hpp>
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
+#include "./compile_time.hpp"
+
+#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_SMART_PTR)
+#define TEST_SMART_PTRS
+#include <memory>
+#endif
+
+#ifdef TEST_SMART_PTRS
+
+void shared_ptr_tests()
+{
+    std::shared_ptr<int> x;
+    compile_time_tests(&x);
+
+    HASH_NAMESPACE::hash<std::shared_ptr<int> > x1;
+    HASH_NAMESPACE::hash<std::shared_ptr<int> > x2;
+
+    std::shared_ptr<int> ptr1(new int(10));
+    std::shared_ptr<int> ptr2;
+
+    BOOST_TEST(x1(x) == x2(ptr2));
+    BOOST_TEST(x1(x) != x2(ptr1));
+    ptr2.reset(new int(10));
+    BOOST_TEST(x1(ptr1) == x2(ptr1));
+    BOOST_TEST(x1(ptr1) != x2(ptr2));
+    ptr2 = ptr1;
+    BOOST_TEST(x1(ptr1) == x2(ptr2));
+#if defined(TEST_EXTENSIONS)
+    BOOST_TEST(x1(x) == HASH_NAMESPACE::hash_value(x));
+    BOOST_TEST(x1(ptr1) == HASH_NAMESPACE::hash_value(ptr2));
+#endif
+}
+
+void unique_ptr_tests()
+{
+    std::unique_ptr<int> x;
+    compile_time_tests(&x);
+
+    HASH_NAMESPACE::hash<std::unique_ptr<int> > x1;
+    HASH_NAMESPACE::hash<std::unique_ptr<int> > x2;
+
+    std::unique_ptr<int> ptr1(new int(10));
+    std::unique_ptr<int> ptr2;
+
+    BOOST_TEST(x1(x) == x2(ptr2));
+    BOOST_TEST(x1(x) != x2(ptr1));
+    ptr2.reset(new int(10));
+    BOOST_TEST(x1(ptr1) == x2(ptr1));
+    BOOST_TEST(x1(ptr1) != x2(ptr2));
+
+#if defined(TEST_EXTENSIONS)
+    BOOST_TEST(x1(x) == HASH_NAMESPACE::hash_value(x));
+#endif
+}
+
+#endif
+
+int main()
+{
+#ifdef TEST_SMART_PTRS
+    shared_ptr_tests();
+    unique_ptr_tests();
+#endif
+
+    return boost::report_errors();
+}
diff --git a/include/boost/functional/hash/detail/container_fwd_0x.hpp b/include/boost/functional/hash/detail/container_fwd_0x.hpp
index 442ec6c..4e2dd7e 100644
--- a/include/boost/functional/hash/detail/container_fwd_0x.hpp
+++ b/include/boost/functional/hash/detail/container_fwd_0x.hpp
@@ -38,4 +38,18 @@ namespace std {
 #    endif
 #endif
 
+// std::shared_ptr/std::unique_ptr
+
+#if !defined(BOOST_NO_CXX11_HDR_MEMORY)
+#   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
+        !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD))
+#       include <memory>
+#    else
+namespace std {
+    template <class> class shared_ptr;
+    template <class, class> class unique_ptr;
+}
+#    endif
+#endif
+
 #endif
diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp
index 9c4a6be..4358736 100644
--- a/include/boost/functional/hash/extensions.hpp
+++ b/include/boost/functional/hash/extensions.hpp
@@ -177,6 +177,18 @@ namespace boost
 #   undef BOOST_HASH_TUPLE_F
 #endif
 
+#endif
+
+#if !defined(BOOST_NO_CXX11_SMART_PTR)
+    template <typename T>
+    inline std::size_t hash_value(std::shared_ptr<T> const& x) {
+        return boost::hash_value(x.get());
+    }
+
+    template <typename T, typename Deleter>
+    inline std::size_t hash_value(std::unique_ptr<T, Deleter> const& x) {
+        return boost::hash_value(x.get());
+    }
 #endif
 
     //

From 0ea992685685968707a6302b8003c571998a5033 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 5 Aug 2012 08:36:49 +0000
Subject: [PATCH 094/111] Merge some link fixes.

[SVN r79869]
---
 hash/doc/tutorial.qbk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index 916ab93..59067a7 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -206,7 +206,7 @@ header which forward declares [classref boost::hash],
 include the main header before instantiating [classref boost::hash]. When using
 a container that uses [classref boost::hash] it should do that for you, so your
 type will work fine with the boost hash containers. There's an example of this
-in [@boost:/libs/unordered/examples/template.hpp template.hpp] and
-[@boost:/libs/unordered/examples/template.cpp template.cpp].
+in [@boost:/libs/functional/hash/examples/template.hpp template.hpp] and
+[@boost:/libs/functional/hash/examples/template.cpp template.cpp].
 
 [endsect]

From 93583b9759ccdd4c41ab7f4d4d0286d0dd0b6c72 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 15 Aug 2012 23:04:49 +0000
Subject: [PATCH 095/111] Hash: Merge C++11 forward declaration fix.

[SVN r80054]
---
 .../hash/detail/container_fwd_0x.hpp          | 32 ++-----------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/include/boost/functional/hash/detail/container_fwd_0x.hpp b/include/boost/functional/hash/detail/container_fwd_0x.hpp
index 4e2dd7e..bed7730 100644
--- a/include/boost/functional/hash/detail/container_fwd_0x.hpp
+++ b/include/boost/functional/hash/detail/container_fwd_0x.hpp
@@ -11,45 +11,19 @@
 // std::array
 
 #if !defined(BOOST_NO_CXX11_HDR_ARRAY)
-    // Don't forward declare std::array for Dinkumware, as it seems to be
-    // just 'using std::tr1::array'.
-#   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
-        !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)) || \
-        (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-#       include <array>
-#    else
-namespace std {
-    template <class, std::size_t> class array;
-}
-#    endif
+#   include <array>
 #endif
 
 // std::tuple
 
 #if !defined(BOOST_NO_CXX11_HDR_TUPLE)
-#   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
-        !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)) || \
-        defined(BOOST_NO_VARIADIC_TEMPLATES)
-#       include <tuple>
-#    else
-namespace std {
-    template <typename...> class tuple;
-}
-#    endif
+#   include <tuple>
 #endif
 
 // std::shared_ptr/std::unique_ptr
 
 #if !defined(BOOST_NO_CXX11_HDR_MEMORY)
-#   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
-        !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD))
-#       include <memory>
-#    else
-namespace std {
-    template <class> class shared_ptr;
-    template <class, class> class unique_ptr;
-}
-#    endif
+#   include <memory>
 #endif
 
 #endif

From ff205e1e8ddc03f401b5a51e5b7960d2e5b92310 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 28 Aug 2012 17:38:30 +0000
Subject: [PATCH 096/111] Merge #error for deperectaed
 `boost/functional/detail/container_fwd.hpp`

[SVN r80286]
---
 hash/test/Jamfile.v2                          |  2 +-
 hash/test/deprecated_container_fwd.cpp        |  8 --------
 .../boost/functional/detail/container_fwd.hpp | 19 +------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index fc731d2..07df1a0 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -51,7 +51,7 @@ test-suite functional/hash
         [ run implicit_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
         [ run hash_no_ext_macro_2.cpp ]
-        [ compile deprecated_container_fwd.cpp ]
+        [ compile-fail deprecated_container_fwd.cpp ]
     ;
 
 test-suite functional/hash_no_ext
diff --git a/hash/test/deprecated_container_fwd.cpp b/hash/test/deprecated_container_fwd.cpp
index 1c6e12b..8238bda 100644
--- a/hash/test/deprecated_container_fwd.cpp
+++ b/hash/test/deprecated_container_fwd.cpp
@@ -4,11 +4,3 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/functional/detail/container_fwd.hpp>
-
-typedef std::vector<int, std::allocator<int> > int_vector;
-
-#include <vector>
-
-int main() {
-    int_vector x;
-}
diff --git a/include/boost/functional/detail/container_fwd.hpp b/include/boost/functional/detail/container_fwd.hpp
index e2bf865..6970472 100644
--- a/include/boost/functional/detail/container_fwd.hpp
+++ b/include/boost/functional/detail/container_fwd.hpp
@@ -7,21 +7,4 @@
 // This header is deprecated, I'll change the warning to an error in a future
 // release, and then later remove the header completely.
 
-#if !defined(BOOST_FUNCTIONAL_DETAIL_CONTAINER_FWD_HPP)
-#define BOOST_FUNCTIONAL_DETAIL_CONTAINER_FWD_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/detail/container_fwd.hpp is deprecated, use boost/detail/container_fwd.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/detail/container_fwd.hpp is deprecated, use boost/detail/container_fwd.hpp instead."
-#endif
-
-#include <boost/detail/container_fwd.hpp>
-
-#endif
+#error "boost/functional/detail/container_fwd.hpp is deprecated, use boost/detail/container_fwd.hpp instead."

From 4ecd864c69b53e70720b223b06227d7995634a28 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 28 Aug 2012 21:48:16 +0000
Subject: [PATCH 097/111] Hash: merge enum support + cleanup some tests.

[SVN r80292]
---
 hash/test/Jamfile.v2                     |  1 +
 hash/test/hash_enum_test.cpp             | 63 ++++++++++++++++++++++++
 hash/test/hash_function_pointer_test.cpp |  4 --
 hash/test/hash_number_test.cpp           |  2 -
 hash/test/hash_pointer_test.cpp          |  4 --
 hash/test/hash_range_test.cpp            |  3 --
 hash/test/hash_string_test.cpp           |  4 --
 include/boost/functional/hash/hash.hpp   | 13 +++++
 8 files changed, 77 insertions(+), 17 deletions(-)
 create mode 100644 hash/test/hash_enum_test.cpp

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 07df1a0..0f41d3e 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -22,6 +22,7 @@ test-suite functional/hash
         [ run hash_fwd_test_1.cpp ]
         [ run hash_fwd_test_2.cpp ]
         [ run hash_number_test.cpp ]
+        [ run hash_enum_test.cpp ]
         [ run hash_pointer_test.cpp ]
         [ run hash_function_pointer_test.cpp ]
         [ run hash_float_test.cpp ]
diff --git a/hash/test/hash_enum_test.cpp b/hash/test/hash_enum_test.cpp
new file mode 100644
index 0000000..30444e5
--- /dev/null
+++ b/hash/test/hash_enum_test.cpp
@@ -0,0 +1,63 @@
+
+// Copyright 2012 Daniel James.
+// Distributed under 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)
+
+#include "./config.hpp"
+
+#ifdef TEST_STD_INCLUDES
+#  include <functional>
+#else
+#  include <boost/functional/hash.hpp>
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
+#include "./compile_time.hpp"
+
+namespace test {
+	enum enum_override { enum_override1, enum_override2 };
+	std::size_t hash_value(enum_override) { return 896532; }
+
+	enum enum1 { enum1a };
+	enum enum2 { enum2a, enum2b };
+	enum enum3 { enum3a = 574, enum3b };
+	enum enum4 { enum4a = -12574, enum4b };
+}
+
+int main() {
+	compile_time_tests((test::enum1*) 0);
+	compile_time_tests((test::enum2*) 0);
+	compile_time_tests((test::enum3*) 0);
+	compile_time_tests((test::enum4*) 0);
+	compile_time_tests((test::enum_override*) 0);
+
+	HASH_NAMESPACE::hash<test::enum1> hash1;
+	HASH_NAMESPACE::hash<test::enum2> hash2;
+	HASH_NAMESPACE::hash<test::enum3> hash3;
+	HASH_NAMESPACE::hash<test::enum4> hash4;
+	
+	BOOST_TEST(hash1(test::enum1a) == hash1(test::enum1a));
+
+	BOOST_TEST(hash2(test::enum2a) == hash2(test::enum2a));
+	BOOST_TEST(hash2(test::enum2a) != hash2(test::enum2b));
+	BOOST_TEST(hash2(test::enum2b) == hash2(test::enum2b));
+
+	BOOST_TEST(hash3(test::enum3a) == hash3(test::enum3a));
+	BOOST_TEST(hash3(test::enum3a) != hash3(test::enum3b));
+	BOOST_TEST(hash3(test::enum3b) == hash3(test::enum3b));
+
+	BOOST_TEST(hash4(test::enum4a) == hash4(test::enum4a));
+	BOOST_TEST(hash4(test::enum4a) != hash4(test::enum4b));
+	BOOST_TEST(hash4(test::enum4b) == hash4(test::enum4b));
+
+	HASH_NAMESPACE::hash<test::enum_override> hash_override;
+
+	BOOST_TEST(hash_override(test::enum_override1) ==
+		hash_override(test::enum_override1));
+	BOOST_TEST(hash_override(test::enum_override1) ==
+		hash_override(test::enum_override2));
+	BOOST_TEST(hash_override(test::enum_override1) ==
+		hash_override(test::enum_override1));
+
+	return boost::report_errors();
+}
diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp
index 73719e2..a73b718 100644
--- a/hash/test/hash_function_pointer_test.cpp
+++ b/hash/test/hash_function_pointer_test.cpp
@@ -12,10 +12,6 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
-
 #include "./compile_time.hpp"
 
 void void_func1() { static int x = 1; ++x; }
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index b233c71..2645dfa 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -16,8 +16,6 @@
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/functional/hash/detail/limits.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
 
 #include "./compile_time.hpp"
 
diff --git a/hash/test/hash_pointer_test.cpp b/hash/test/hash_pointer_test.cpp
index 5fcbc27..b255a28 100644
--- a/hash/test/hash_pointer_test.cpp
+++ b/hash/test/hash_pointer_test.cpp
@@ -12,11 +12,7 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
 #include <boost/limits.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
-
 #include "./compile_time.hpp"
 
 void pointer_tests()
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index 8743e1e..f5fdb2a 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -18,10 +18,7 @@ int main() {}
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
 #include <boost/limits.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
 #include <vector>
 
 void hash_range_tests()
diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp
index b3b8394..29ff28e 100644
--- a/hash/test/hash_string_test.cpp
+++ b/hash/test/hash_string_test.cpp
@@ -12,11 +12,7 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
 #include <string>
-
 #include "./compile_time.hpp"
 
 void string_tests()
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index c179fab..647fd68 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -15,6 +15,8 @@
 #include <boost/functional/hash/detail/hash_float.hpp>
 #include <string>
 #include <boost/limits.hpp>
+#include <boost/type_traits/is_enum.hpp>
+#include <boost/utility/enable_if.hpp>
 
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 #include <boost/type_traits/is_pointer.hpp>
@@ -90,6 +92,10 @@ namespace boost
     template <typename T>
     typename boost::hash_detail::ulong_numbers<T>::type hash_value(T);
 
+    template <typename T>
+    typename boost::enable_if<boost::is_enum<T>, std::size_t>::type
+    	hash_value(T);
+
 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
     template <class T> std::size_t hash_value(T* const&);
 #else
@@ -179,6 +185,13 @@ namespace boost
         return hash_detail::hash_value_unsigned(v);
     }
 
+    template <typename T>
+    typename boost::enable_if<boost::is_enum<T>, std::size_t>::type
+    	hash_value(T v)
+    {
+    	return static_cast<std::size_t>(v);
+    }
+
     // Implementation by Alberto Barbati and Dave Harris.
 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
     template <class T> std::size_t hash_value(T* const& v)

From 52615a7f732979ba945fad6dd3d322bfe4d0b6fb Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 28 Aug 2012 21:50:57 +0000
Subject: [PATCH 098/111] Hash: Merge new floating point hasher.

Uses a binary hash for more platforms.


[SVN r80293]
---
 hash/test/Jamfile.v2                          |  15 +-
 .../functional/hash/detail/hash_float.hpp     | 181 ++++++++++++++++--
 .../hash/detail/hash_float_generic.hpp        |  91 ---------
 .../functional/hash/detail/hash_float_x86.hpp |  56 ------
 4 files changed, 181 insertions(+), 162 deletions(-)
 delete mode 100644 include/boost/functional/hash/detail/hash_float_generic.hpp
 delete mode 100644 include/boost/functional/hash/detail/hash_float_x86.hpp

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 0f41d3e..5b7c39a 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -1,5 +1,5 @@
 
-# Copyright 2005-2011 Daniel James.
+# Copyright 2005-2012 Daniel James.
 # Distributed under 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)
 
@@ -66,4 +66,17 @@ test-suite functional/hash_no_ext
         [ run link_test.cpp link_test_2.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_link_test ]
     ;
 
+# Tests to see if the floating point hash is using the binary hash.
+# Not run normally because on some platforms these should fail.
+test-suite functional/hash_no_generic_float
+    :
+        [ run hash_float_test.cpp
+            : : : <define>BOOST_HASH_DETAIL_TEST_WITHOUT_GENERIC
+            : hash_float_test_no_generic ]
+        [ run hash_long_double_test.cpp
+            : : : <define>BOOST_HASH_DETAIL_TEST_WITHOUT_GENERIC
+            : hash_long_double_test_no_generic ]
+    ;
+explicit functional/hash_no_generic_float ;
+
 build-project ../examples ;
diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/functional/hash/detail/hash_float.hpp
index 194be1c..3edc6ab 100644
--- a/include/boost/functional/hash/detail/hash_float.hpp
+++ b/include/boost/functional/hash/detail/hash_float.hpp
@@ -1,5 +1,5 @@
 
-// Copyright 2005-2009 Daniel James.
+// Copyright 2005-2012 Daniel James.
 // Distributed under 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)
 
@@ -13,21 +13,19 @@
 #include <boost/config.hpp>
 #include <boost/functional/hash/detail/float_functions.hpp>
 #include <boost/functional/hash/detail/limits.hpp>
+#include <boost/utility/enable_if.hpp>
 #include <boost/integer/static_log2.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/assert.hpp>
+#include <boost/limits.hpp>
+#include <cstring>
 
-// Include hash implementation for the current platform.
-
-// Cygwn
-#if defined(__CYGWIN__)
-#  if defined(__i386__) || defined(_M_IX86)
-#    include <boost/functional/hash/detail/hash_float_x86.hpp>
-#  else
-#    include <boost/functional/hash/detail/hash_float_generic.hpp>
-#  endif
-#else
-#  include <boost/functional/hash/detail/hash_float_generic.hpp>
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#if BOOST_MSVC >= 1400
+#pragma warning(disable:6294) // Ill-defined for-loop: initial condition does
+                              // not satisfy test. Loop body not executed
+#endif
 #endif
 
 // Can we use fpclassify?
@@ -50,6 +48,157 @@
 #  define BOOST_HASH_USE_FPCLASSIFY 0
 #endif
 
+namespace boost
+{
+    namespace hash_detail
+    {
+        inline void hash_float_combine(std::size_t& seed, std::size_t value)
+        {
+            seed ^= value + (seed<<6) + (seed>>2);
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        // Binary hash function
+        //
+        // Only used for floats with known iec559 floats, and certain values in
+        // numeric_limits
+
+        inline std::size_t hash_binary(char* ptr, std::size_t length)
+        {
+            std::size_t seed = 0;
+
+            if (length >= sizeof(std::size_t)) {
+                seed = *(std::size_t*) ptr;
+                length -= sizeof(std::size_t);
+                ptr += sizeof(std::size_t);
+
+                while(length >= sizeof(std::size_t)) {
+                    hash_float_combine(seed, *(std::size_t*) ptr);
+                    length -= sizeof(std::size_t);
+                    ptr += sizeof(std::size_t);
+                }
+            }
+
+            if (length > 0) {
+                std::size_t buffer = 0;
+                std::memcpy(&buffer, ptr, length);
+                hash_float_combine(seed, buffer);
+            }
+
+            return seed;
+        }
+
+        template <typename Float>
+        inline std::size_t float_hash_impl(Float v,
+            BOOST_DEDUCED_TYPENAME boost::enable_if_c<
+                std::numeric_limits<Float>::is_iec559 &&
+                std::numeric_limits<Float>::digits == 24 &&
+                std::numeric_limits<Float>::radix == 2 &&
+                std::numeric_limits<Float>::max_exponent == 128,
+                int>::type
+            )
+        {
+            return hash_binary((char*) &v, 4);
+        }
+
+
+        template <typename Float>
+        inline std::size_t float_hash_impl(Float v,
+            BOOST_DEDUCED_TYPENAME boost::enable_if_c<
+                std::numeric_limits<Float>::is_iec559 &&
+                std::numeric_limits<Float>::digits == 53 &&
+                std::numeric_limits<Float>::radix == 2 &&
+                std::numeric_limits<Float>::max_exponent == 1024,
+                int>::type
+            )
+        {
+            return hash_binary((char*) &v, 8);
+        }
+
+        template <typename Float>
+        inline std::size_t float_hash_impl(Float v,
+            BOOST_DEDUCED_TYPENAME boost::enable_if_c<
+                std::numeric_limits<Float>::is_iec559 &&
+                std::numeric_limits<Float>::digits == 64 &&
+                std::numeric_limits<Float>::radix == 2 &&
+                std::numeric_limits<Float>::max_exponent == 16384,
+                int>::type
+            )
+        {
+            return hash_binary((char*) &v, 10);
+        }
+
+        template <typename Float>
+        inline std::size_t float_hash_impl(Float v,
+            BOOST_DEDUCED_TYPENAME boost::enable_if_c<
+                std::numeric_limits<Float>::is_iec559 &&
+                std::numeric_limits<Float>::digits == 113 &&
+                std::numeric_limits<Float>::radix == 2 &&
+                std::numeric_limits<Float>::max_exponent == 16384,
+                int>::type
+            )
+        {
+            return hash_binary((char*) &v, 16);
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        // Portable hash function
+        //
+        // Used as a fallback when the binary hash function isn't supported.
+
+        template <class T>
+        inline std::size_t float_hash_impl2(T v)
+        {
+            boost::hash_detail::call_frexp<T> frexp;
+            boost::hash_detail::call_ldexp<T> ldexp;
+
+            int exp = 0;
+
+            v = frexp(v, &exp);
+
+            // A postive value is easier to hash, so combine the
+            // sign with the exponent and use the absolute value.
+            if(v < 0) {
+                v = -v;
+                exp += limits<T>::max_exponent -
+                    limits<T>::min_exponent;
+            }
+
+            v = ldexp(v, limits<std::size_t>::digits);
+            std::size_t seed = static_cast<std::size_t>(v);
+            v -= static_cast<T>(seed);
+
+            // ceiling(digits(T) * log2(radix(T))/ digits(size_t)) - 1;
+            std::size_t const length
+                = (limits<T>::digits *
+                        boost::static_log2<limits<T>::radix>::value
+                        + limits<std::size_t>::digits - 1)
+                / limits<std::size_t>::digits;
+
+            for(std::size_t i = 0; i != length; ++i)
+            {
+                v = ldexp(v, limits<std::size_t>::digits);
+                std::size_t part = static_cast<std::size_t>(v);
+                v -= static_cast<T>(part);
+                hash_float_combine(seed, part);
+            }
+
+            hash_float_combine(seed, exp);
+
+            return seed;
+        }
+
+#if !defined(BOOST_HASH_DETAIL_TEST_WITHOUT_GENERIC)
+        template <class T>
+        inline std::size_t float_hash_impl(T v, ...)
+        {
+            typedef BOOST_DEDUCED_TYPENAME select_hash_type<T>::type type;
+            return float_hash_impl2(static_cast<type>(v));
+        }
+#endif
+    }
+}
+
 #if BOOST_HASH_USE_FPCLASSIFY
 
 #include <boost/config/no_tr1/cmath.hpp>
@@ -71,7 +220,7 @@ namespace boost
                 return (std::size_t)(-3);
             case FP_NORMAL:
             case FP_SUBNORMAL:
-                return float_hash_impl(v);
+                return float_hash_impl(v, 0);
             default:
                 BOOST_ASSERT(0);
                 return 0;
@@ -103,7 +252,7 @@ namespace boost
         template <class T>
         inline std::size_t float_hash_value(T v)
         {
-            return boost::hash_detail::is_zero(v) ? 0 : float_hash_impl(v);
+            return boost::hash_detail::is_zero(v) ? 0 : float_hash_impl(v, 0);
         }
     }
 }
@@ -112,4 +261,8 @@ namespace boost
 
 #undef BOOST_HASH_USE_FPCLASSIFY
 
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/boost/functional/hash/detail/hash_float_generic.hpp b/include/boost/functional/hash/detail/hash_float_generic.hpp
deleted file mode 100644
index 1278c2f..0000000
--- a/include/boost/functional/hash/detail/hash_float_generic.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// Copyright 2005-2009 Daniel James.
-// Distributed under 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)
-
-// A general purpose hash function for non-zero floating point values.
-
-#if !defined(BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_GENERIC_HEADER)
-#define BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_GENERIC_HEADER
-
-#include <boost/functional/hash/detail/float_functions.hpp>
-#include <boost/integer/static_log2.hpp>
-#include <boost/functional/hash/detail/limits.hpp>
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-#if BOOST_MSVC >= 1400
-#pragma warning(disable:6294) // Ill-defined for-loop: initial condition does
-                              // not satisfy test. Loop body not executed 
-#endif
-#endif
-
-namespace boost
-{
-    namespace hash_detail
-    {
-        inline void hash_float_combine(std::size_t& seed, std::size_t value)
-        {
-            seed ^= value + (seed<<6) + (seed>>2);
-        }
-
-        template <class T>
-        inline std::size_t float_hash_impl2(T v)
-        {
-            boost::hash_detail::call_frexp<T> frexp;
-            boost::hash_detail::call_ldexp<T> ldexp;
-        
-            int exp = 0;
-
-            v = frexp(v, &exp);
-
-            // A postive value is easier to hash, so combine the
-            // sign with the exponent and use the absolute value.
-            if(v < 0) {
-                v = -v;
-                exp += limits<T>::max_exponent -
-                    limits<T>::min_exponent;
-            }
-
-            v = ldexp(v, limits<std::size_t>::digits);
-            std::size_t seed = static_cast<std::size_t>(v);
-            v -= static_cast<T>(seed);
-
-            // ceiling(digits(T) * log2(radix(T))/ digits(size_t)) - 1;
-            std::size_t const length
-                = (limits<T>::digits *
-                        boost::static_log2<limits<T>::radix>::value
-                        + limits<std::size_t>::digits - 1)
-                / limits<std::size_t>::digits;
-
-            for(std::size_t i = 0; i != length; ++i)
-            {
-                v = ldexp(v, limits<std::size_t>::digits);
-                std::size_t part = static_cast<std::size_t>(v);
-                v -= static_cast<T>(part);
-                hash_float_combine(seed, part);
-            }
-
-            hash_float_combine(seed, exp);
-
-            return seed;
-        }
-
-        template <class T>
-        inline std::size_t float_hash_impl(T v)
-        {
-            typedef BOOST_DEDUCED_TYPENAME select_hash_type<T>::type type;
-            return float_hash_impl2(static_cast<type>(v));
-        }
-    }
-}
-
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/include/boost/functional/hash/detail/hash_float_x86.hpp b/include/boost/functional/hash/detail/hash_float_x86.hpp
deleted file mode 100644
index b39bb0d..0000000
--- a/include/boost/functional/hash/detail/hash_float_x86.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// Copyright 2005-2009 Daniel James.
-// Distributed under 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)
-
-// A non-portable hash function form non-zero floats on x86.
-//
-// Even if you're on an x86 platform, this might not work if their floating
-// point isn't set up as this expects. So this should only be used if it's
-// absolutely certain that it will work.
-
-#if !defined(BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_X86_HEADER)
-#define BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_X86_HEADER
-
-#include <boost/cstdint.hpp>
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-namespace boost
-{
-    namespace hash_detail
-    {
-        inline void hash_float_combine(std::size_t& seed, std::size_t value)
-        {
-            seed ^= value + (seed<<6) + (seed>>2);
-        }
-
-        inline std::size_t float_hash_impl(float v)
-        {
-            boost::uint32_t* ptr = (boost::uint32_t*)&v;
-            std::size_t seed = *ptr;
-            return seed;
-        }
-
-        inline std::size_t float_hash_impl(double v)
-        {
-            boost::uint32_t* ptr = (boost::uint32_t*)&v;
-            std::size_t seed = *ptr++;
-            hash_float_combine(seed, *ptr);
-            return seed;
-        }
-
-        inline std::size_t float_hash_impl(long double v)
-        {
-            boost::uint32_t* ptr = (boost::uint32_t*)&v;
-            std::size_t seed = *ptr++;
-            hash_float_combine(seed, *ptr++);
-            hash_float_combine(seed, *(boost::uint16_t*)ptr);
-            return seed;
-        }
-    }
-}
-
-#endif

From 2746a65ffe12f0a298926904a5cb27db5f6d3777 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 30 Sep 2012 11:58:06 +0000
Subject: [PATCH 099/111] Unordered/Hash: Merge change log.

[SVN r80778]
---
 hash/doc/changes.qbk | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 3aa3dee..c98bd86 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -132,4 +132,17 @@
 * Add deprecation warning to the long deprecated
   `boost/functional/detail/container_fwd.hpp`.
 
+[h2 Boost 1.51.0]
+
+* Support the standard smart pointers.
+* `hash_value` now implemented using SFINAE to avoid implicit casts to built
+  in types when calling it.
+* Updated to use the new config macros.
+
+[h2 Boost 1.52.0]
+
+* Restore `enum` support, which was accidentally removed in the last version.
+* New floating point hasher - will hash the binary representation on more
+  platforms, which should be faster.
+
 [endsect]

From 04321ad5c2ba2fd0f6e5eeddc83adab7fdd517ad Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 15 Nov 2012 13:25:08 +0000
Subject: [PATCH 100/111] Remove deprecated container_fwd header.

[SVN r81356]
---
 hash/test/Jamfile.v2                              |  1 -
 hash/test/deprecated_container_fwd.cpp            |  6 ------
 include/boost/functional/detail/container_fwd.hpp | 10 ----------
 3 files changed, 17 deletions(-)
 delete mode 100644 hash/test/deprecated_container_fwd.cpp
 delete mode 100644 include/boost/functional/detail/container_fwd.hpp

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 5b7c39a..34b69e6 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -52,7 +52,6 @@ test-suite functional/hash
         [ run implicit_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
         [ run hash_no_ext_macro_2.cpp ]
-        [ compile-fail deprecated_container_fwd.cpp ]
     ;
 
 test-suite functional/hash_no_ext
diff --git a/hash/test/deprecated_container_fwd.cpp b/hash/test/deprecated_container_fwd.cpp
deleted file mode 100644
index 8238bda..0000000
--- a/hash/test/deprecated_container_fwd.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-// Copyright 2012 Daniel James.
-// Distributed under 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)
-
-#include <boost/functional/detail/container_fwd.hpp>
diff --git a/include/boost/functional/detail/container_fwd.hpp b/include/boost/functional/detail/container_fwd.hpp
deleted file mode 100644
index 6970472..0000000
--- a/include/boost/functional/detail/container_fwd.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-
-// Copyright 2005-2012 Daniel James.
-// Distributed under 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)
-
-// Forwarding header for container_fwd.hpp's new location.
-// This header is deprecated, I'll change the warning to an error in a future
-// release, and then later remove the header completely.
-
-#error "boost/functional/detail/container_fwd.hpp is deprecated, use boost/detail/container_fwd.hpp instead."

From ae1f465a7a1dfd4e44b7efedea3853f839db0818 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 20 Dec 2012 20:38:09 +0000
Subject: [PATCH 101/111] Merge hash test fixes.

[SVN r82125]
---
 hash/test/Jamfile.v2                     |  2 +-
 hash/test/compile_time.hpp               |  2 +-
 hash/test/config.hpp                     | 10 ++---
 hash/test/hash_built_in_array_test.cpp   | 30 +++++++-------
 hash/test/hash_complex_test.cpp          | 10 ++---
 hash/test/hash_custom_test.cpp           | 28 ++++++-------
 hash/test/hash_deque_test.cpp            | 10 ++---
 hash/test/hash_enum_test.cpp             | 12 +++---
 hash/test/hash_float_test.hpp            | 48 +++++++++++------------
 hash/test/hash_friend_test.cpp           | 28 ++++++-------
 hash/test/hash_function_pointer_test.cpp | 12 +++---
 hash/test/hash_fwd_test.hpp              | 22 +++++------
 hash/test/hash_fwd_test_1.cpp            | 36 ++++++++---------
 hash/test/hash_fwd_test_2.cpp            |  4 +-
 hash/test/hash_global_namespace_test.cpp | 28 ++++++-------
 hash/test/hash_list_test.cpp             | 10 ++---
 hash/test/hash_map_test.cpp              | 10 ++---
 hash/test/hash_map_test.hpp              |  6 +--
 hash/test/hash_no_ext_fail_test.cpp      |  4 +-
 hash/test/hash_no_ext_macro_1.cpp        |  8 ++--
 hash/test/hash_no_ext_macro_2.cpp        |  8 ++--
 hash/test/hash_number_test.cpp           | 46 +++++++++++-----------
 hash/test/hash_pointer_test.cpp          | 12 +++---
 hash/test/hash_range_test.cpp            | 50 ++++++++++++------------
 hash/test/hash_sequence_test.hpp         |  6 +--
 hash/test/hash_set_test.cpp              |  8 ++--
 hash/test/hash_set_test.hpp              |  6 +--
 hash/test/hash_std_array_test.cpp        |  6 +--
 hash/test/hash_std_smart_ptr_test.cpp    | 22 +++++------
 hash/test/hash_std_tuple_test.cpp        |  6 +--
 hash/test/hash_string_test.cpp           | 38 +++++++++---------
 hash/test/hash_type_index_test.cpp       | 10 ++---
 hash/test/hash_value_array_test.cpp      | 24 ++++++------
 hash/test/hash_vector_test.cpp           | 10 ++---
 hash/test/link_ext_test.cpp              | 12 +++---
 hash/test/link_no_ext_test.cpp           |  4 +-
 36 files changed, 294 insertions(+), 294 deletions(-)
 mode change 100644 => 100755 hash/test/Jamfile.v2

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
old mode 100644
new mode 100755
index 5325b19..2767bf3
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -9,7 +9,7 @@ project hash-tests
     : requirements
         <warnings>all
         <toolset>intel:<warnings>on
-        <toolset>intel:<cxxflags>-strict-ansi
+        #<toolset>intel:<cxxflags>-strict-ansi
         <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
         <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
         #<toolset>msvc:<warnings-as-errors>on
diff --git a/hash/test/compile_time.hpp b/hash/test/compile_time.hpp
index bd86038..40f39d8 100644
--- a/hash/test/compile_time.hpp
+++ b/hash/test/compile_time.hpp
@@ -11,6 +11,6 @@ template <class T>
 void compile_time_tests(T*)
 {
     BOOST_STATIC_ASSERT((boost::is_base_and_derived<
-        std::unary_function<T, std::size_t>, HASH_NAMESPACE::hash<T> >::value));
+        std::unary_function<T, std::size_t>, BOOST_HASH_TEST_NAMESPACE::hash<T> >::value));
 }
 
diff --git a/hash/test/config.hpp b/hash/test/config.hpp
index 216d9c4..53edf0a 100644
--- a/hash/test/config.hpp
+++ b/hash/test/config.hpp
@@ -3,13 +3,13 @@
 // Distributed under 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)
 
-#if defined(TEST_STD)
-#  define TEST_STD_INCLUDES
-#  define HASH_NAMESPACE std
+#if defined(BOOST_HASH_TEST_STD)
+#  define BOOST_HASH_TEST_STD_INCLUDES
+#  define BOOST_HASH_TEST_NAMESPACE std
 #else
-#  define HASH_NAMESPACE boost
+#  define BOOST_HASH_TEST_NAMESPACE boost
 #  if !defined(BOOST_HASH_NO_EXTENSIONS)
-#    define TEST_EXTENSIONS
+#    define BOOST_HASH_TEST_EXTENSIONS
 #  endif
 #endif
 
diff --git a/hash/test/hash_built_in_array_test.cpp b/hash/test/hash_built_in_array_test.cpp
index 9c91799..e2dfe99 100644
--- a/hash/test/hash_built_in_array_test.cpp
+++ b/hash/test/hash_built_in_array_test.cpp
@@ -5,8 +5,8 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -15,7 +15,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
 
 void array_int_test()
 {
@@ -27,47 +27,47 @@ void array_int_test()
         8, -12, 23, 65, 45,
         -1, 93, -54, 987, 3
     };
-    HASH_NAMESPACE::hash<int[25]> hasher1;
+    BOOST_HASH_TEST_NAMESPACE::hash<int[25]> hasher1;
 
     const int length2 = 1;
     int array2[1] = {3};
-    HASH_NAMESPACE::hash<int[1]> hasher2;
+    BOOST_HASH_TEST_NAMESPACE::hash<int[1]> hasher2;
 
     const int length3 = 2;
     int array3[2] = {2, 3};
-    HASH_NAMESPACE::hash<int[2]> hasher3;
+    BOOST_HASH_TEST_NAMESPACE::hash<int[2]> hasher3;
 
     BOOST_TEST(hasher1(array1)
-            == HASH_NAMESPACE::hash_range(array1, array1 + length1));
+            == BOOST_HASH_TEST_NAMESPACE::hash_range(array1, array1 + length1));
     BOOST_TEST(hasher2(array2)
-            == HASH_NAMESPACE::hash_range(array2, array2 + length2));
+            == BOOST_HASH_TEST_NAMESPACE::hash_range(array2, array2 + length2));
     BOOST_TEST(hasher3(array3)
-            == HASH_NAMESPACE::hash_range(array3, array3 + length3));
+            == BOOST_HASH_TEST_NAMESPACE::hash_range(array3, array3 + length3));
 }
 
 void two_dimensional_array_test()
 {
     int array[3][2] = {{-5, 6}, {7, -3}, {26, 1}};
-    HASH_NAMESPACE::hash<int[3][2]> hasher;
+    BOOST_HASH_TEST_NAMESPACE::hash<int[3][2]> hasher;
 
     std::size_t seed1 = 0;
     for(int i = 0; i < 3; ++i)
     {
         std::size_t seed2 = 0;
         for(int j = 0; j < 2; ++j)
-            HASH_NAMESPACE::hash_combine(seed2, array[i][j]);
-        HASH_NAMESPACE::hash_combine(seed1, seed2);
+            BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, array[i][j]);
+        BOOST_HASH_TEST_NAMESPACE::hash_combine(seed1, seed2);
     }
 
     BOOST_TEST(hasher(array) == seed1);
-    BOOST_TEST(hasher(array) == HASH_NAMESPACE::hash_range(array, array + 3));
+    BOOST_TEST(hasher(array) == BOOST_HASH_TEST_NAMESPACE::hash_range(array, array + 3));
 }
 
-#endif // TEST_EXTENSIONS
+#endif // BOOST_HASH_TEST_EXTENSIONS
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     array_int_test();
     two_dimensional_array_test();
 #endif
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
index 36d2673..617b51b 100644
--- a/hash/test/hash_complex_test.cpp
+++ b/hash/test/hash_complex_test.cpp
@@ -5,13 +5,13 @@
 
 #include "./config.hpp"
 
-#if !defined(TEST_EXTENSIONS)
+#if !defined(BOOST_HASH_TEST_EXTENSIONS)
 
 int main() {}
 
 #else
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -46,11 +46,11 @@ int main() {}
 template <class T>
 void generic_complex_tests(std::complex<T> v)
 {
-    HASH_NAMESPACE::hash<std::complex<T> > complex_hasher;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::complex<T> > complex_hasher;
 
     BOOST_TEST(complex_hasher(v) == complex_hasher(v));
 
-    HASH_NAMESPACE::hash<T> real_hasher;
+    BOOST_HASH_TEST_NAMESPACE::hash<T> real_hasher;
     T real = v.real();
     T imag = v.imag();
 
@@ -107,4 +107,4 @@ int main()
     return boost::report_errors();
 }
 
-#endif // TEST_EXTENSIONS
+#endif // BOOST_HASH_TEST_EXTENSIONS
diff --git a/hash/test/hash_custom_test.cpp b/hash/test/hash_custom_test.cpp
index 966df09..75f1c2b 100644
--- a/hash/test/hash_custom_test.cpp
+++ b/hash/test/hash_custom_test.cpp
@@ -41,8 +41,8 @@ namespace boost
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -51,7 +51,7 @@ namespace boost
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
 
 #include <vector>
 #include <string>
@@ -59,13 +59,13 @@ namespace boost
 
 void custom_tests()
 {
-    HASH_NAMESPACE::hash<test::custom> custom_hasher;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::custom> custom_hasher;
     BOOST_TEST(custom_hasher(10) == 100u);
     test::custom x(55);
     BOOST_TEST(custom_hasher(x) == 550u);
 
     {
-        using namespace HASH_NAMESPACE;
+        using namespace BOOST_HASH_TEST_NAMESPACE;
         BOOST_TEST(custom_hasher(x) == hash_value(x));
     }
 
@@ -75,25 +75,25 @@ void custom_tests()
     custom_vector.push_back(35);
 
     std::size_t seed = 0;
-    HASH_NAMESPACE::hash_combine(seed, test::custom(5));
-    HASH_NAMESPACE::hash_combine(seed, test::custom(25));
-    HASH_NAMESPACE::hash_combine(seed, test::custom(35));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, test::custom(5));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, test::custom(25));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, test::custom(35));
 
     std::size_t seed2 = 0;
-    HASH_NAMESPACE::hash_combine(seed2, 50u);
-    HASH_NAMESPACE::hash_combine(seed2, 250u);
-    HASH_NAMESPACE::hash_combine(seed2, 350u);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 50u);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 250u);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_TEST(seed == HASH_NAMESPACE::hash_range(
+    BOOST_TEST(seed == BOOST_HASH_TEST_NAMESPACE::hash_range(
         custom_vector.begin(), custom_vector.end()));
     BOOST_TEST(seed == seed2);
 }
 
-#endif // TEST_EXTENSIONS
+#endif // BOOST_HASH_TEST_EXTENSIONS
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     custom_tests();
 #endif
     return boost::report_errors();
diff --git a/hash/test/hash_deque_test.cpp b/hash/test/hash_deque_test.cpp
index bfb2691..4d7f447 100644
--- a/hash/test/hash_deque_test.cpp
+++ b/hash/test/hash_deque_test.cpp
@@ -5,8 +5,8 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -15,7 +15,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
 
 #include <deque>
 
@@ -23,11 +23,11 @@ using std::deque;
 #define CONTAINER_TYPE deque
 #include "./hash_sequence_test.hpp"
 
-#endif // TEST_EXTENSIONS
+#endif // BOOST_HASH_TEST_EXTENSIONS
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     deque_tests::deque_hash_integer_tests();
 #endif
 
diff --git a/hash/test/hash_enum_test.cpp b/hash/test/hash_enum_test.cpp
index 016ea69..2872b43 100644
--- a/hash/test/hash_enum_test.cpp
+++ b/hash/test/hash_enum_test.cpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -31,10 +31,10 @@ int main() {
     compile_time_tests((test::enum4*) 0);
     compile_time_tests((test::enum_override*) 0);
 
-    HASH_NAMESPACE::hash<test::enum1> hash1;
-    HASH_NAMESPACE::hash<test::enum2> hash2;
-    HASH_NAMESPACE::hash<test::enum3> hash3;
-    HASH_NAMESPACE::hash<test::enum4> hash4;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::enum1> hash1;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::enum2> hash2;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::enum3> hash3;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::enum4> hash4;
 
     BOOST_TEST(hash1(test::enum1a) == hash1(test::enum1a));
 
@@ -50,7 +50,7 @@ int main() {
     BOOST_TEST(hash4(test::enum4a) != hash4(test::enum4b));
     BOOST_TEST(hash4(test::enum4b) == hash4(test::enum4b));
 
-    HASH_NAMESPACE::hash<test::enum_override> hash_override;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::enum_override> hash_override;
 
     BOOST_TEST(hash_override(test::enum_override1) ==
         hash_override(test::enum_override1));
diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp
index a61d9de..8c2a43a 100644
--- a/hash/test/hash_float_test.hpp
+++ b/hash/test/hash_float_test.hpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -43,7 +43,7 @@ void float_tests(char const* name, T* = 0)
 {
     std::cerr
         <<  "\n"
-        <<  "Testing " BOOST_STRINGIZE(HASH_NAMESPACE) "::hash<"
+        <<  "Testing " BOOST_STRINGIZE(BOOST_HASH_TEST_NAMESPACE) "::hash<"
         <<  name
         <<  ">\n"
         <<  "\n"
@@ -70,7 +70,7 @@ void float_tests(char const* name, T* = 0)
         <<  "\n"
         ;
 
-    HASH_NAMESPACE::hash<T> x1;
+    BOOST_HASH_TEST_NAMESPACE::hash<T> x1;
 
     T zero = 0;
     T minus_zero = (T) -1 * zero;
@@ -78,9 +78,9 @@ void float_tests(char const* name, T* = 0)
     BOOST_TEST(zero == minus_zero);
     BOOST_TEST(x1(zero) == x1(minus_zero));
 
-#if defined(TEST_EXTENSIONS)
-    BOOST_TEST(x1(zero) == HASH_NAMESPACE::hash_value(zero));
-    BOOST_TEST(x1(minus_zero) == HASH_NAMESPACE::hash_value(minus_zero));
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
+    BOOST_TEST(x1(zero) == BOOST_HASH_TEST_NAMESPACE::hash_value(zero));
+    BOOST_TEST(x1(minus_zero) == BOOST_HASH_TEST_NAMESPACE::hash_value(minus_zero));
 #endif
 
     BOOST_TEST(x1(zero) != x1(0.5));
@@ -106,10 +106,10 @@ void float_tests(char const* name, T* = 0)
         T minus_infinity2 = (T) -1. / zero;
         T minus_infinity3 = (T) 1. / minus_zero;
 
-#if defined(TEST_EXTENSIONS)
-        BOOST_TEST(x1(infinity) == HASH_NAMESPACE::hash_value(infinity));
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
+        BOOST_TEST(x1(infinity) == BOOST_HASH_TEST_NAMESPACE::hash_value(infinity));
         BOOST_TEST(x1(minus_infinity)
-                == HASH_NAMESPACE::hash_value(minus_infinity));
+                == BOOST_HASH_TEST_NAMESPACE::hash_value(minus_infinity));
 #endif
 
         if(infinity == infinity2)
@@ -191,12 +191,12 @@ void float_tests(char const* name, T* = 0)
     BOOST_TEST(three_quarter_max != -three_quarter_max);
 
 
-#if defined(TEST_EXTENSIONS)
-    BOOST_TEST(x1(max) == HASH_NAMESPACE::hash_value(max));
-    BOOST_TEST(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
-    BOOST_TEST(x1(quarter_max) == HASH_NAMESPACE::hash_value(quarter_max));
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
+    BOOST_TEST(x1(max) == BOOST_HASH_TEST_NAMESPACE::hash_value(max));
+    BOOST_TEST(x1(half_max) == BOOST_HASH_TEST_NAMESPACE::hash_value(half_max));
+    BOOST_TEST(x1(quarter_max) == BOOST_HASH_TEST_NAMESPACE::hash_value(quarter_max));
     BOOST_TEST(x1(three_quarter_max) ==
-        HASH_NAMESPACE::hash_value(three_quarter_max));
+        BOOST_HASH_TEST_NAMESPACE::hash_value(three_quarter_max));
 #endif
 
     // The '!=' tests could legitimately fail, but with my hash it indicates a
@@ -227,16 +227,16 @@ void float_tests(char const* name, T* = 0)
     if(v1 == v2)
         BOOST_TEST(x1(v1) == x1(v2));
 
-#if defined(TEST_EXTENSIONS)
-    BOOST_TEST(x1(v1) == HASH_NAMESPACE::hash_value(v1));
-    BOOST_TEST(x1(v2) == HASH_NAMESPACE::hash_value(v2));
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
+    BOOST_TEST(x1(v1) == BOOST_HASH_TEST_NAMESPACE::hash_value(v1));
+    BOOST_TEST(x1(v2) == BOOST_HASH_TEST_NAMESPACE::hash_value(v2));
 #endif
     
 #endif
 
-#if defined(TEST_EXTENSIONS)
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
     BOOST_TEST(x1(boost::hash_detail::limits<T>::epsilon()) ==
-            HASH_NAMESPACE::hash_value(
+            BOOST_HASH_TEST_NAMESPACE::hash_value(
                 boost::hash_detail::limits<T>::epsilon()));
 #endif
 
@@ -269,12 +269,12 @@ void float_tests(char const* name, T* = 0)
         if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(zero)) {
             std::cerr<<"x1(denorm_min) == x1(zero) == "<<x1(zero)<<"\n";
         }
-#if !BOOST_WORKAROUND(__DECCXX_VER,<70190006) && defined(TEST_EXTENSIONS)
+#if !BOOST_WORKAROUND(__DECCXX_VER,<70190006) && defined(BOOST_HASH_TEST_EXTENSIONS)
         // The Tru64/CXX standard library prior to 7.1 contains a bug in the
         // specialization of boost::hash_detail::limits::denorm_min() for long
         // doubles which causes this test to fail.
         if(x1(boost::hash_detail::limits<T>::denorm_min()) !=
-            HASH_NAMESPACE::hash_value(
+            BOOST_HASH_TEST_NAMESPACE::hash_value(
                 boost::hash_detail::limits<T>::denorm_min()))
         {
             std::cerr
@@ -282,7 +282,7 @@ void float_tests(char const* name, T* = 0)
                 <<  x1(boost::hash_detail::limits<T>::denorm_min())
                 <<  "\nhash_value(boost::hash_detail::limits<T>::denorm_min())"
                     " = "
-                <<  HASH_NAMESPACE::hash_value(
+                <<  BOOST_HASH_TEST_NAMESPACE::hash_value(
                         boost::hash_detail::limits<T>::denorm_min())
                 <<  "\nx1(0) = "
                 <<  x1(0)
@@ -292,13 +292,13 @@ void float_tests(char const* name, T* = 0)
     }
 
 // NaN also causes borland to crash.
-#if !defined(__BORLANDC__) && defined(TEST_EXTENSIONS)
+#if !defined(__BORLANDC__) && defined(BOOST_HASH_TEST_EXTENSIONS)
     if(boost::hash_detail::limits<T>::has_quiet_NaN) {
         if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(1.0)) {
             std::cerr<<"x1(quiet_NaN) == x1(1.0) == "<<x1(1.0)<<"\n";
         }
         BOOST_TEST(x1(boost::hash_detail::limits<T>::quiet_NaN()) ==
-            HASH_NAMESPACE::hash_value(
+            BOOST_HASH_TEST_NAMESPACE::hash_value(
                 boost::hash_detail::limits<T>::quiet_NaN()));
     }
 #endif
diff --git a/hash/test/hash_friend_test.cpp b/hash/test/hash_friend_test.cpp
index 9d84570..03755a8 100644
--- a/hash/test/hash_friend_test.cpp
+++ b/hash/test/hash_friend_test.cpp
@@ -44,8 +44,8 @@ namespace boost
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -54,7 +54,7 @@ namespace boost
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
 
 #include <vector>
 #include <string>
@@ -62,13 +62,13 @@ namespace boost
 
 void custom_tests()
 {
-    HASH_NAMESPACE::hash<test::custom<int> > custom_hasher;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::custom<int> > custom_hasher;
     BOOST_TEST(custom_hasher(10) == 100u);
     test::custom<int> x(55);
     BOOST_TEST(custom_hasher(x) == 550u);
 
     {
-        using namespace HASH_NAMESPACE;
+        using namespace BOOST_HASH_TEST_NAMESPACE;
         BOOST_TEST(custom_hasher(x) == hash_value(x));
     }
 
@@ -78,25 +78,25 @@ void custom_tests()
     custom_vector.push_back(35);
 
     std::size_t seed = 0;
-    HASH_NAMESPACE::hash_combine(seed, test::custom<int>(5));
-    HASH_NAMESPACE::hash_combine(seed, test::custom<int>(25));
-    HASH_NAMESPACE::hash_combine(seed, test::custom<int>(35));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, test::custom<int>(5));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, test::custom<int>(25));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, test::custom<int>(35));
 
     std::size_t seed2 = 0;
-    HASH_NAMESPACE::hash_combine(seed2, 50u);
-    HASH_NAMESPACE::hash_combine(seed2, 250u);
-    HASH_NAMESPACE::hash_combine(seed2, 350u);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 50u);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 250u);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_TEST(seed == HASH_NAMESPACE::hash_range(
+    BOOST_TEST(seed == BOOST_HASH_TEST_NAMESPACE::hash_range(
         custom_vector.begin(), custom_vector.end()));
     BOOST_TEST(seed == seed2);
 }
 
-#endif // TEST_EXTENSIONS
+#endif // BOOST_HASH_TEST_EXTENSIONS
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     custom_tests();
 #endif
     return boost::report_errors();
diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp
index a73b718..50fedf7 100644
--- a/hash/test/hash_function_pointer_test.cpp
+++ b/hash/test/hash_function_pointer_test.cpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -24,8 +24,8 @@ void function_pointer_tests()
     compile_time_tests((void(**)()) 0);
     compile_time_tests((int(**)(int)) 0);
 
-    HASH_NAMESPACE::hash<void(*)()> hasher_void;
-    HASH_NAMESPACE::hash<int(*)(int)> hasher_int;
+    BOOST_HASH_TEST_NAMESPACE::hash<void(*)()> hasher_void;
+    BOOST_HASH_TEST_NAMESPACE::hash<int(*)(int)> hasher_int;
 
     BOOST_TEST(&void_func1 != &void_func2);
     BOOST_TEST(&int_func1 != &int_func2);
@@ -38,11 +38,11 @@ void function_pointer_tests()
     BOOST_TEST(hasher_int(&int_func1) == hasher_int(&int_func1));
     BOOST_TEST(hasher_int(&int_func1) != hasher_int(&int_func2));
     BOOST_TEST(hasher_int(&int_func1) != hasher_int(0));
-#if defined(TEST_EXTENSIONS)
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
     BOOST_TEST(hasher_void(&void_func1)
-            == HASH_NAMESPACE::hash_value(&void_func1));
+            == BOOST_HASH_TEST_NAMESPACE::hash_value(&void_func1));
     BOOST_TEST(hasher_int(&int_func1)
-            == HASH_NAMESPACE::hash_value(&int_func1));
+            == BOOST_HASH_TEST_NAMESPACE::hash_value(&int_func1));
 
     // This isn't specified in Peter's proposal:
     BOOST_TEST(hasher_void(0) == 0);
diff --git a/hash/test/hash_fwd_test.hpp b/hash/test/hash_fwd_test.hpp
index 09ef3b3..d3c8186 100644
--- a/hash/test/hash_fwd_test.hpp
+++ b/hash/test/hash_fwd_test.hpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#if defined(TEST_EXTENSIONS) && !defined(TEST_STD_INCLUDES)
+#if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_HASH_TEST_STD_INCLUDES)
 #include <boost/functional/hash_fwd.hpp>
 
 #include <boost/config.hpp>
@@ -25,7 +25,7 @@ namespace test {
     template <class T>
     std::size_t hash_value(test_type1<T> const& x)
     {
-        HASH_NAMESPACE::hash<T> hasher;
+        BOOST_HASH_TEST_NAMESPACE::hash<T> hasher;
         return hasher(x.value);
     }
 #endif
@@ -42,8 +42,8 @@ namespace test {
     std::size_t hash_value(test_type2<T> const& x)
     {
         std::size_t seed = 0;
-        HASH_NAMESPACE::hash_combine(seed, x.value1);
-        HASH_NAMESPACE::hash_combine(seed, x.value2);
+        BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, x.value1);
+        BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, x.value2);
         return seed;
     }
 #endif
@@ -61,8 +61,8 @@ namespace test {
     std::size_t hash_value(test_type3<T> const& x)
     {
         std::size_t seed =
-            HASH_NAMESPACE::hash_range(x.values.begin(), x.values.end());
-        HASH_NAMESPACE::hash_range(seed, x.values.begin(), x.values.end());
+            BOOST_HASH_TEST_NAMESPACE::hash_range(x.values.begin(), x.values.end());
+        BOOST_HASH_TEST_NAMESPACE::hash_range(seed, x.values.begin(), x.values.end());
         return seed;
     }
 #endif
@@ -76,7 +76,7 @@ namespace boost
     template <class T>
     std::size_t hash_value(test::test_type1<T> const& x)
     {
-        HASH_NAMESPACE::hash<T> hasher;
+        BOOST_HASH_TEST_NAMESPACE::hash<T> hasher;
         return hasher(x.value);
     }
 
@@ -84,8 +84,8 @@ namespace boost
     std::size_t hash_value(test::test_type2<T> const& x)
     {
         std::size_t seed = 0;
-        HASH_NAMESPACE::hash_combine(seed, x.value1);
-        HASH_NAMESPACE::hash_combine(seed, x.value2);
+        BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, x.value1);
+        BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, x.value2);
         return seed;
     }
 
@@ -93,8 +93,8 @@ namespace boost
     std::size_t hash_value(test::test_type3<T> const& x)
     {
         std::size_t seed =
-            HASH_NAMESPACE::hash_range(x.values.begin(), x.values.end());
-        HASH_NAMESPACE::hash_range(seed, x.values.begin(), x.values.end());
+            BOOST_HASH_TEST_NAMESPACE::hash_range(x.values.begin(), x.values.end());
+        BOOST_HASH_TEST_NAMESPACE::hash_range(seed, x.values.begin(), x.values.end());
         return seed;
     }
 }
diff --git a/hash/test/hash_fwd_test_1.cpp b/hash/test/hash_fwd_test_1.cpp
index 1f27f65..68fdde2 100644
--- a/hash/test/hash_fwd_test_1.cpp
+++ b/hash/test/hash_fwd_test_1.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#if defined(TEST_EXTENSIONS) && !defined(TEST_STD_INCLUDES)
+#if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_HASH_TEST_STD_INCLUDES)
 
 #include <boost/functional/hash.hpp>
 #include <string>
@@ -21,10 +21,10 @@ void fwd_test1()
     test::test_type1<int> x(5);
     test::test_type1<std::string> y("Test");
 
-    HASH_NAMESPACE::hash<int> hasher_int;
-    HASH_NAMESPACE::hash<std::string> hasher_string;
-    HASH_NAMESPACE::hash<test::test_type1<int> > hasher_test_int;
-    HASH_NAMESPACE::hash<test::test_type1<std::string> > hasher_test_string;
+    BOOST_HASH_TEST_NAMESPACE::hash<int> hasher_int;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::string> hasher_string;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::test_type1<int> > hasher_test_int;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::test_type1<std::string> > hasher_test_string;
 
     BOOST_TEST(hasher_int(5) == hasher_test_int(x));
     BOOST_TEST(hasher_string("Test") == hasher_test_string(y));
@@ -36,15 +36,15 @@ void fwd_test2()
     test::test_type2<std::string> y("Test1", "Test2");
 
     std::size_t seed1 = 0;
-    HASH_NAMESPACE::hash_combine(seed1, 5);
-    HASH_NAMESPACE::hash_combine(seed1, 10);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed1, 5);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed1, 10);
 
     std::size_t seed2 = 0;
-    HASH_NAMESPACE::hash_combine(seed2, std::string("Test1"));
-    HASH_NAMESPACE::hash_combine(seed2, std::string("Test2"));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, std::string("Test1"));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, std::string("Test2"));
 
-    HASH_NAMESPACE::hash<test::test_type2<int> > hasher_test_int;
-    HASH_NAMESPACE::hash<test::test_type2<std::string> > hasher_test_string;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::test_type2<int> > hasher_test_int;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::test_type2<std::string> > hasher_test_string;
 
     BOOST_TEST(seed1 == hasher_test_int(x));
     BOOST_TEST(seed2 == hasher_test_string(y));
@@ -69,15 +69,15 @@ void fwd_test3()
     test::test_type3<std::string> y(values2.begin(), values2.end());
 
     std::size_t seed1 =
-        HASH_NAMESPACE::hash_range(values1.begin(), values1.end());
-    HASH_NAMESPACE::hash_range(seed1, values1.begin(), values1.end());
+        BOOST_HASH_TEST_NAMESPACE::hash_range(values1.begin(), values1.end());
+    BOOST_HASH_TEST_NAMESPACE::hash_range(seed1, values1.begin(), values1.end());
 
     std::size_t seed2 =
-        HASH_NAMESPACE::hash_range(values2.begin(), values2.end());
-    HASH_NAMESPACE::hash_range(seed2, values2.begin(), values2.end());
+        BOOST_HASH_TEST_NAMESPACE::hash_range(values2.begin(), values2.end());
+    BOOST_HASH_TEST_NAMESPACE::hash_range(seed2, values2.begin(), values2.end());
 
-    HASH_NAMESPACE::hash<test::test_type3<int> > hasher_test_int;
-    HASH_NAMESPACE::hash<test::test_type3<std::string> > hasher_test_string;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::test_type3<int> > hasher_test_int;
+    BOOST_HASH_TEST_NAMESPACE::hash<test::test_type3<std::string> > hasher_test_string;
 
     BOOST_TEST(seed1 == hasher_test_int(x));
     BOOST_TEST(seed2 == hasher_test_string(y));
@@ -87,7 +87,7 @@ void fwd_test3()
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     fwd_test1();
     fwd_test2();
     fwd_test3();
diff --git a/hash/test/hash_fwd_test_2.cpp b/hash/test/hash_fwd_test_2.cpp
index 869f67b..d4c1a32 100644
--- a/hash/test/hash_fwd_test_2.cpp
+++ b/hash/test/hash_fwd_test_2.cpp
@@ -8,7 +8,7 @@
 
 #include "./config.hpp"
 
-#if !defined(TEST_EXTENSIONS) || defined(TEST_STD_INCLUDES)
+#if !defined(BOOST_HASH_TEST_EXTENSIONS) || defined(BOOST_HASH_TEST_STD_INCLUDES)
 
 int main() {}
 
@@ -44,4 +44,4 @@ int main()
     return boost::report_errors();
 }
 
-#endif // defined(TEST_EXTENSIONS) && !defined(TEST_STD_INCLUDES)
+#endif // defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_HASH_TEST_STD_INCLUDES)
diff --git a/hash/test/hash_global_namespace_test.cpp b/hash/test/hash_global_namespace_test.cpp
index d1d504d..877ff00 100644
--- a/hash/test/hash_global_namespace_test.cpp
+++ b/hash/test/hash_global_namespace_test.cpp
@@ -42,8 +42,8 @@ namespace boost
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -52,7 +52,7 @@ namespace boost
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
 
 #include <vector>
 #include <string>
@@ -60,13 +60,13 @@ namespace boost
 
 void custom_tests()
 {
-    HASH_NAMESPACE::hash<custom> custom_hasher;
+    BOOST_HASH_TEST_NAMESPACE::hash<custom> custom_hasher;
     BOOST_TEST(custom_hasher(10) == 100u);
     custom x(55);
     BOOST_TEST(custom_hasher(x) == 550u);
 
     {
-        using namespace HASH_NAMESPACE;
+        using namespace BOOST_HASH_TEST_NAMESPACE;
         BOOST_TEST(custom_hasher(x) == hash_value(x));
     }
 
@@ -76,26 +76,26 @@ void custom_tests()
     custom_vector.push_back(35);
 
     std::size_t seed = 0;
-    HASH_NAMESPACE::hash_combine(seed, custom(5));
-    HASH_NAMESPACE::hash_combine(seed, custom(25));
-    HASH_NAMESPACE::hash_combine(seed, custom(35));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, custom(5));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, custom(25));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, custom(35));
 
     std::size_t seed2 = 0;
-    HASH_NAMESPACE::hash_combine(seed2, 50u);
-    HASH_NAMESPACE::hash_combine(seed2, 250u);
-    HASH_NAMESPACE::hash_combine(seed2, 350u);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 50u);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 250u);
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 350u);
 
-    BOOST_TEST(seed == HASH_NAMESPACE::hash_range(
+    BOOST_TEST(seed == BOOST_HASH_TEST_NAMESPACE::hash_range(
         custom_vector.begin(), custom_vector.end()));
     BOOST_TEST(seed == seed2);
 }
 
-#endif // TEST_EXTENSIONS
+#endif // BOOST_HASH_TEST_EXTENSIONS
 
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     custom_tests();
 #endif
     return boost::report_errors();
diff --git a/hash/test/hash_list_test.cpp b/hash/test/hash_list_test.cpp
index 30560d3..a0f9716 100644
--- a/hash/test/hash_list_test.cpp
+++ b/hash/test/hash_list_test.cpp
@@ -5,8 +5,8 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -15,7 +15,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
 
 #include <list>
 
@@ -23,11 +23,11 @@ using std::list;
 #define CONTAINER_TYPE list
 #include "./hash_sequence_test.hpp"
 
-#endif // TEST_EXTENSIONS
+#endif // BOOST_HASH_TEST_EXTENSIONS
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     list_tests::list_hash_integer_tests();
 #endif
 
diff --git a/hash/test/hash_map_test.cpp b/hash/test/hash_map_test.cpp
index 7e117c7..01a7854 100644
--- a/hash/test/hash_map_test.cpp
+++ b/hash/test/hash_map_test.cpp
@@ -5,8 +5,8 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -17,7 +17,7 @@
 
 #include <map>
 
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
 
 using std::map;
 #define CONTAINER_TYPE map
@@ -27,11 +27,11 @@ using std::multimap;
 #define CONTAINER_TYPE multimap
 #include "./hash_map_test.hpp"
 
-#endif // TEST_EXTENSIONS
+#endif // BOOST_HASH_TEST_EXTENSIONS
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     map_tests::map_hash_integer_tests();
     multimap_tests::multimap_hash_integer_tests();
 #endif
diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp
index bd0255f..41bb2fa 100644
--- a/hash/test/hash_map_test.hpp
+++ b/hash/test/hash_map_test.hpp
@@ -38,16 +38,16 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         containers[9].insert(pair(key(-1),value(3)));
         containers[9].insert(pair(key(-1),value(3)));
 
-        HASH_NAMESPACE::hash<T> hasher;
+        BOOST_HASH_TEST_NAMESPACE::hash<T> hasher;
 
         for(int i2 = 0; i2 < number_of_containers; ++i2) {
             BOOST_TEST(hasher(containers[i2]) == hasher(containers[i2]));
 
             BOOST_TEST(hasher(containers[i2]) ==
-                    HASH_NAMESPACE::hash_value(containers[i2]));
+                    BOOST_HASH_TEST_NAMESPACE::hash_value(containers[i2]));
 
             BOOST_TEST(hasher(containers[i2])
-                    == HASH_NAMESPACE::hash_range(
+                    == BOOST_HASH_TEST_NAMESPACE::hash_range(
                         containers[i2].begin(), containers[i2].end()));
 
             for(int j2 = i2 + 1; j2 < number_of_containers; ++j2) {
diff --git a/hash/test/hash_no_ext_fail_test.cpp b/hash/test/hash_no_ext_fail_test.cpp
index 22f6f5a..6d1636e 100644
--- a/hash/test/hash_no_ext_fail_test.cpp
+++ b/hash/test/hash_no_ext_fail_test.cpp
@@ -11,7 +11,7 @@
 #  define BOOST_HASH_NO_EXTENSIONS
 #endif
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -21,7 +21,7 @@ template <class T> void ignore(T const&) {}
 
 int main()
 {
-    HASH_NAMESPACE::hash< int[10] > hasher;
+    BOOST_HASH_TEST_NAMESPACE::hash< int[10] > hasher;
     ignore(hasher);
 
     return 0;
diff --git a/hash/test/hash_no_ext_macro_1.cpp b/hash/test/hash_no_ext_macro_1.cpp
index ea727bb..d69e5b5 100644
--- a/hash/test/hash_no_ext_macro_1.cpp
+++ b/hash/test/hash_no_ext_macro_1.cpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#if defined(TEST_EXTENSIONS)
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
 
 // Include header without BOOST_HASH_NO_EXTENSIONS defined
 #  if defined(BOOST_HASH_NO_EXTENSIONS)
@@ -23,14 +23,14 @@
 
 int main()
 {
-#if defined(TEST_EXTENSIONS)
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
     std::deque<int> x;
 
     x.push_back(1);
     x.push_back(2);
 
-    HASH_NAMESPACE::hash<std::deque<int> > hasher;
-    BOOST_TEST(hasher(x) == HASH_NAMESPACE::hash_value(x));
+    BOOST_HASH_TEST_NAMESPACE::hash<std::deque<int> > hasher;
+    BOOST_TEST(hasher(x) == BOOST_HASH_TEST_NAMESPACE::hash_value(x));
 #endif
 
     return boost::report_errors();
diff --git a/hash/test/hash_no_ext_macro_2.cpp b/hash/test/hash_no_ext_macro_2.cpp
index a8d8c65..fe548ee 100644
--- a/hash/test/hash_no_ext_macro_2.cpp
+++ b/hash/test/hash_no_ext_macro_2.cpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#if defined(TEST_EXTENSIONS)
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
 
 // Include header with BOOST_HASH_NO_EXTENSIONS defined
 #  if !defined(BOOST_HASH_NO_EXTENSIONS)
@@ -23,14 +23,14 @@
 
 int main()
 {
-#if defined(TEST_EXTENSIONS)
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
     std::map<int, int> x;
 
     x.insert(std::map<int, int>::value_type(53, -42));
     x.insert(std::map<int, int>::value_type(14, -75));
 
-    HASH_NAMESPACE::hash<std::map<int, int> > hasher;
-    BOOST_TEST(hasher(x) == HASH_NAMESPACE::hash_value(x));
+    BOOST_HASH_TEST_NAMESPACE::hash<std::map<int, int> > hasher;
+    BOOST_TEST(hasher(x) == BOOST_HASH_TEST_NAMESPACE::hash_value(x));
 #endif
     
     return boost::report_errors();
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index e4555e3..242c731 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -41,11 +41,11 @@ void numeric_extra_tests(typename
     if(limits::is_signed ||
         limits::digits <= boost::hash_detail::limits<std::size_t>::digits)
     {
-        BOOST_TEST(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
+        BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
     }
-    BOOST_TEST(HASH_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
-    BOOST_TEST(HASH_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
-    BOOST_TEST(HASH_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
 }
 
 template <class T>
@@ -62,8 +62,8 @@ void numeric_test(T*)
 
     compile_time_tests((T*) 0);
 
-    HASH_NAMESPACE::hash<T> x1;
-    HASH_NAMESPACE::hash<T> x2;
+    BOOST_HASH_TEST_NAMESPACE::hash<T> x1;
+    BOOST_HASH_TEST_NAMESPACE::hash<T> x2;
 
     T v1 = (T) -5;
     BOOST_TEST(x1(v1) == x2(v1));
@@ -74,11 +74,11 @@ void numeric_test(T*)
     BOOST_TEST(x1(T(5) - T(5)) == x2(T(0)));
     BOOST_TEST(x1(T(6) + T(4)) == x2(T(10)));
 
-#if defined(TEST_EXTENSIONS)
-    BOOST_TEST(x1(T(-5)) == HASH_NAMESPACE::hash_value(T(-5)));
-    BOOST_TEST(x1(T(0)) == HASH_NAMESPACE::hash_value(T(0)));
-    BOOST_TEST(x1(T(10)) == HASH_NAMESPACE::hash_value(T(10)));
-    BOOST_TEST(x1(T(25)) == HASH_NAMESPACE::hash_value(T(25)));
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
+    BOOST_TEST(x1(T(-5)) == BOOST_HASH_TEST_NAMESPACE::hash_value(T(-5)));
+    BOOST_TEST(x1(T(0)) == BOOST_HASH_TEST_NAMESPACE::hash_value(T(0)));
+    BOOST_TEST(x1(T(10)) == BOOST_HASH_TEST_NAMESPACE::hash_value(T(10)));
+    BOOST_TEST(x1(T(25)) == BOOST_HASH_TEST_NAMESPACE::hash_value(T(25)));
 
     numeric_extra_tests<T>();
 #endif
@@ -91,8 +91,8 @@ void limits_test(T*)
 
     if(limits::is_specialized)
     {
-        HASH_NAMESPACE::hash<T> x1;
-        HASH_NAMESPACE::hash<T> x2;
+        BOOST_HASH_TEST_NAMESPACE::hash<T> x1;
+        BOOST_HASH_TEST_NAMESPACE::hash<T> x2;
 
         T min_value = (limits::min)();
         T max_value = (limits::max)();
@@ -100,15 +100,15 @@ void limits_test(T*)
         BOOST_TEST(x1(min_value) == x2((limits::min)()));
         BOOST_TEST(x1(max_value) == x2((limits::max)()));
 
-#if defined(TEST_EXTENSIONS)
-        BOOST_TEST(x1(min_value) == HASH_NAMESPACE::hash_value(min_value));
-        BOOST_TEST(x1(max_value) == HASH_NAMESPACE::hash_value(max_value));
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
+        BOOST_TEST(x1(min_value) == BOOST_HASH_TEST_NAMESPACE::hash_value(min_value));
+        BOOST_TEST(x1(max_value) == BOOST_HASH_TEST_NAMESPACE::hash_value(max_value));
 
         if (limits::is_integer)
         {
-            BOOST_TEST(HASH_NAMESPACE::hash_value(min_value)
+            BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(min_value)
                     == std::size_t(min_value));
-            BOOST_TEST(HASH_NAMESPACE::hash_value(max_value)
+            BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(max_value)
                     == std::size_t(max_value));
         }
 #endif
@@ -120,8 +120,8 @@ void poor_quality_tests(T*)
 {
     typedef boost::hash_detail::limits<T> limits;
 
-    HASH_NAMESPACE::hash<T> x1;
-    HASH_NAMESPACE::hash<T> x2;
+    BOOST_HASH_TEST_NAMESPACE::hash<T> x1;
+    BOOST_HASH_TEST_NAMESPACE::hash<T> x2;
 
     // A hash function can legally fail these tests, but it'll not be a good
     // sign.
@@ -136,8 +136,8 @@ void poor_quality_tests(T*)
 
 void bool_test()
 {
-    HASH_NAMESPACE::hash<bool> x1;
-    HASH_NAMESPACE::hash<bool> x2;
+    BOOST_HASH_TEST_NAMESPACE::hash<bool> x1;
+    BOOST_HASH_TEST_NAMESPACE::hash<bool> x2;
     
     BOOST_TEST(x1(true) == x2(true));
     BOOST_TEST(x1(false) == x2(false));
diff --git a/hash/test/hash_pointer_test.cpp b/hash/test/hash_pointer_test.cpp
index b255a28..7cacaa8 100644
--- a/hash/test/hash_pointer_test.cpp
+++ b/hash/test/hash_pointer_test.cpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -20,8 +20,8 @@ void pointer_tests()
     compile_time_tests((int**) 0);
     compile_time_tests((void**) 0);
 
-    HASH_NAMESPACE::hash<int*> x1;
-    HASH_NAMESPACE::hash<int*> x2;
+    BOOST_HASH_TEST_NAMESPACE::hash<int*> x1;
+    BOOST_HASH_TEST_NAMESPACE::hash<int*> x2;
 
     int int1;
     int int2;
@@ -29,9 +29,9 @@ void pointer_tests()
     BOOST_TEST(x1(0) == x2(0));
     BOOST_TEST(x1(&int1) == x2(&int1));
     BOOST_TEST(x1(&int2) == x2(&int2));
-#if defined(TEST_EXTENSIONS)
-    BOOST_TEST(x1(&int1) == HASH_NAMESPACE::hash_value(&int1));
-    BOOST_TEST(x1(&int2) == HASH_NAMESPACE::hash_value(&int2));
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
+    BOOST_TEST(x1(&int1) == BOOST_HASH_TEST_NAMESPACE::hash_value(&int1));
+    BOOST_TEST(x1(&int2) == BOOST_HASH_TEST_NAMESPACE::hash_value(&int2));
 
     // This isn't specified in Peter's proposal:
     BOOST_TEST(x1(0) == 0);
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index f5fdb2a..a5bdbb6 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -5,13 +5,13 @@
 
 #include "./config.hpp"
 
-#if !defined(TEST_EXTENSIONS)
+#if !defined(BOOST_HASH_TEST_EXTENSIONS)
 
 int main() {}
 
 #else
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -40,39 +40,39 @@ void hash_range_tests()
     std::vector<int> x;
 
     std::size_t x_seed = 0;
-    BOOST_TEST(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_TEST(x_seed == BOOST_HASH_TEST_NAMESPACE::hash_range(x.begin(), x.end()));
 
-    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
-        == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
-        != HASH_NAMESPACE::hash_range(values1.begin(), values1.end()));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_range(empty.begin(), empty.end())
+        == BOOST_HASH_TEST_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_range(empty.begin(), empty.end())
+        != BOOST_HASH_TEST_NAMESPACE::hash_range(values1.begin(), values1.end()));
 
     x.push_back(10);
-    HASH_NAMESPACE::hash_combine(x_seed, 10);
-    BOOST_TEST(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(x_seed, 10);
+    BOOST_TEST(x_seed == BOOST_HASH_TEST_NAMESPACE::hash_range(x.begin(), x.end()));
 
-    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
-        != HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_range(values2.begin(), values2.end())
-        == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_range(empty.begin(), empty.end())
+        != BOOST_HASH_TEST_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_range(values2.begin(), values2.end())
+        == BOOST_HASH_TEST_NAMESPACE::hash_range(x.begin(), x.end()));
 
     x.push_back(20);
-    HASH_NAMESPACE::hash_combine(x_seed, 20);
-    BOOST_TEST(x_seed == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_HASH_TEST_NAMESPACE::hash_combine(x_seed, 20);
+    BOOST_TEST(x_seed == BOOST_HASH_TEST_NAMESPACE::hash_range(x.begin(), x.end()));
 
-    BOOST_TEST(HASH_NAMESPACE::hash_range(empty.begin(), empty.end())
-        != HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_range(values2.begin(), values2.end())
-        != HASH_NAMESPACE::hash_range(x.begin(), x.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_range(values3.begin(), values3.end())
-        == HASH_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_range(empty.begin(), empty.end())
+        != BOOST_HASH_TEST_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_range(values2.begin(), values2.end())
+        != BOOST_HASH_TEST_NAMESPACE::hash_range(x.begin(), x.end()));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_range(values3.begin(), values3.end())
+        == BOOST_HASH_TEST_NAMESPACE::hash_range(x.begin(), x.end()));
 
     std::size_t seed =
-        HASH_NAMESPACE::hash_range(values3.begin(), values3.end());
-    HASH_NAMESPACE::hash_range(seed, values4.begin(), values4.end());
-    HASH_NAMESPACE::hash_range(seed, x.begin(), x.end());
+        BOOST_HASH_TEST_NAMESPACE::hash_range(values3.begin(), values3.end());
+    BOOST_HASH_TEST_NAMESPACE::hash_range(seed, values4.begin(), values4.end());
+    BOOST_HASH_TEST_NAMESPACE::hash_range(seed, x.begin(), x.end());
     BOOST_TEST(seed ==
-        HASH_NAMESPACE::hash_range(values5.begin(), values5.end()));
+        BOOST_HASH_TEST_NAMESPACE::hash_range(values5.begin(), values5.end()));
 }
 
 int main()
diff --git a/hash/test/hash_sequence_test.hpp b/hash/test/hash_sequence_test.hpp
index 4093bc4..e0846b0 100644
--- a/hash/test/hash_sequence_test.hpp
+++ b/hash/test/hash_sequence_test.hpp
@@ -38,16 +38,16 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         containers[10].push_back(-1);
         containers[10].push_back(1);
 
-        HASH_NAMESPACE::hash<T> hasher;
+        BOOST_HASH_TEST_NAMESPACE::hash<T> hasher;
 
         for(int i2 = 0; i2 < number_of_containers; ++i2) {
             BOOST_TEST(hasher(containers[i2]) == hasher(containers[i2]));
 
             BOOST_TEST(hasher(containers[i2]) ==
-                    HASH_NAMESPACE::hash_value(containers[i2]));
+                    BOOST_HASH_TEST_NAMESPACE::hash_value(containers[i2]));
 
             BOOST_TEST(hasher(containers[i2])
-                    == HASH_NAMESPACE::hash_range(
+                    == BOOST_HASH_TEST_NAMESPACE::hash_range(
                         containers[i2].begin(), containers[i2].end()));
 
             for(int j2 = i2 + 1; j2 < number_of_containers; ++j2) {
diff --git a/hash/test/hash_set_test.cpp b/hash/test/hash_set_test.cpp
index 8b5463d..1cf9fef 100644
--- a/hash/test/hash_set_test.cpp
+++ b/hash/test/hash_set_test.cpp
@@ -5,8 +5,8 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -15,7 +15,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
 
 #include <set>
 
@@ -31,7 +31,7 @@ using std::multiset;
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     set_tests::set_hash_integer_tests();
     multiset_tests::multiset_hash_integer_tests();
 #endif
diff --git a/hash/test/hash_set_test.hpp b/hash/test/hash_set_test.hpp
index 2a60781..31d4909 100644
--- a/hash/test/hash_set_test.hpp
+++ b/hash/test/hash_set_test.hpp
@@ -41,16 +41,16 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         containers[11].insert(4);
         containers[11].insert(5);
 
-        HASH_NAMESPACE::hash<T> hasher;
+        BOOST_HASH_TEST_NAMESPACE::hash<T> hasher;
 
         for(int i2 = 0; i2 < number_of_containers; ++i2) {
             BOOST_TEST(hasher(containers[i2]) == hasher(containers[i2]));
 
             BOOST_TEST(hasher(containers[i2]) ==
-                    HASH_NAMESPACE::hash_value(containers[i2]));
+                    BOOST_HASH_TEST_NAMESPACE::hash_value(containers[i2]));
 
             BOOST_TEST(hasher(containers[i2])
-                    == HASH_NAMESPACE::hash_range(
+                    == BOOST_HASH_TEST_NAMESPACE::hash_range(
                         containers[i2].begin(), containers[i2].end()));
 
             for(int j2 = i2 + 1; j2 < number_of_containers; ++j2) {
diff --git a/hash/test/hash_std_array_test.cpp b/hash/test/hash_std_array_test.cpp
index 6f67a67..2b240a3 100644
--- a/hash/test/hash_std_array_test.cpp
+++ b/hash/test/hash_std_array_test.cpp
@@ -5,8 +5,8 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -16,7 +16,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_ARRAY)
+#if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_ARRAY)
 #define TEST_ARRAY
 #include <array>
 #include <vector>
diff --git a/hash/test/hash_std_smart_ptr_test.cpp b/hash/test/hash_std_smart_ptr_test.cpp
index 7452585..feb09d9 100644
--- a/hash/test/hash_std_smart_ptr_test.cpp
+++ b/hash/test/hash_std_smart_ptr_test.cpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -14,7 +14,7 @@
 #include <boost/detail/lightweight_test.hpp>
 #include "./compile_time.hpp"
 
-#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_SMART_PTR)
+#if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_SMART_PTR)
 #define TEST_SMART_PTRS
 #include <memory>
 #endif
@@ -26,8 +26,8 @@ void shared_ptr_tests()
     std::shared_ptr<int> x;
     compile_time_tests(&x);
 
-    HASH_NAMESPACE::hash<std::shared_ptr<int> > x1;
-    HASH_NAMESPACE::hash<std::shared_ptr<int> > x2;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::shared_ptr<int> > x1;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::shared_ptr<int> > x2;
 
     std::shared_ptr<int> ptr1(new int(10));
     std::shared_ptr<int> ptr2;
@@ -39,9 +39,9 @@ void shared_ptr_tests()
     BOOST_TEST(x1(ptr1) != x2(ptr2));
     ptr2 = ptr1;
     BOOST_TEST(x1(ptr1) == x2(ptr2));
-#if defined(TEST_EXTENSIONS)
-    BOOST_TEST(x1(x) == HASH_NAMESPACE::hash_value(x));
-    BOOST_TEST(x1(ptr1) == HASH_NAMESPACE::hash_value(ptr2));
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
+    BOOST_TEST(x1(x) == BOOST_HASH_TEST_NAMESPACE::hash_value(x));
+    BOOST_TEST(x1(ptr1) == BOOST_HASH_TEST_NAMESPACE::hash_value(ptr2));
 #endif
 }
 
@@ -50,8 +50,8 @@ void unique_ptr_tests()
     std::unique_ptr<int> x;
     compile_time_tests(&x);
 
-    HASH_NAMESPACE::hash<std::unique_ptr<int> > x1;
-    HASH_NAMESPACE::hash<std::unique_ptr<int> > x2;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::unique_ptr<int> > x1;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::unique_ptr<int> > x2;
 
     std::unique_ptr<int> ptr1(new int(10));
     std::unique_ptr<int> ptr2;
@@ -62,8 +62,8 @@ void unique_ptr_tests()
     BOOST_TEST(x1(ptr1) == x2(ptr1));
     BOOST_TEST(x1(ptr1) != x2(ptr2));
 
-#if defined(TEST_EXTENSIONS)
-    BOOST_TEST(x1(x) == HASH_NAMESPACE::hash_value(x));
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
+    BOOST_TEST(x1(x) == BOOST_HASH_TEST_NAMESPACE::hash_value(x));
 #endif
 }
 
diff --git a/hash/test/hash_std_tuple_test.cpp b/hash/test/hash_std_tuple_test.cpp
index 9314336..97bea99 100644
--- a/hash/test/hash_std_tuple_test.cpp
+++ b/hash/test/hash_std_tuple_test.cpp
@@ -5,8 +5,8 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -16,7 +16,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_TUPLE)
+#if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_TUPLE)
 #define TEST_TUPLE
 #include <tuple>
 #include <vector>
diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp
index 29ff28e..de8ca87 100644
--- a/hash/test/hash_string_test.cpp
+++ b/hash/test/hash_string_test.cpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -19,22 +19,22 @@ void string_tests()
 {
     compile_time_tests((std::string*) 0);
 
-    HASH_NAMESPACE::hash<std::string> x1;
-    HASH_NAMESPACE::hash<std::string> x2;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::string> x1;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::string> x2;
 
     BOOST_TEST(x1("Hello") == x2(std::string("Hel") + "lo"));
     BOOST_TEST(x1("") == x2(std::string()));
 
-#if defined(TEST_EXTENSIONS)
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
     std::string value1;
     std::string value2("Hello");
 
-    BOOST_TEST(x1(value1) == HASH_NAMESPACE::hash_value(value1));
-    BOOST_TEST(x1(value2) == HASH_NAMESPACE::hash_value(value2));
-    BOOST_TEST(HASH_NAMESPACE::hash_value(value1) ==
-            HASH_NAMESPACE::hash_range(value1.begin(), value1.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_value(value2) ==
-            HASH_NAMESPACE::hash_range(value2.begin(), value2.end()));
+    BOOST_TEST(x1(value1) == BOOST_HASH_TEST_NAMESPACE::hash_value(value1));
+    BOOST_TEST(x1(value2) == BOOST_HASH_TEST_NAMESPACE::hash_value(value2));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(value1) ==
+            BOOST_HASH_TEST_NAMESPACE::hash_range(value1.begin(), value1.end()));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(value2) ==
+            BOOST_HASH_TEST_NAMESPACE::hash_range(value2.begin(), value2.end()));
 #endif
 }
 
@@ -43,22 +43,22 @@ void wstring_tests()
 {
     compile_time_tests((std::wstring*) 0);
 
-    HASH_NAMESPACE::hash<std::wstring> x1;
-    HASH_NAMESPACE::hash<std::wstring> x2;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::wstring> x1;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::wstring> x2;
 
     BOOST_TEST(x1(L"Hello") == x2(std::wstring(L"Hel") + L"lo"));
     BOOST_TEST(x1(L"") == x2(std::wstring()));
 
-#if defined(TEST_EXTENSIONS)
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
     std::wstring value1;
     std::wstring value2(L"Hello");
 
-    BOOST_TEST(x1(value1) == HASH_NAMESPACE::hash_value(value1));
-    BOOST_TEST(x1(value2) == HASH_NAMESPACE::hash_value(value2));
-    BOOST_TEST(HASH_NAMESPACE::hash_value(value1) ==
-            HASH_NAMESPACE::hash_range(value1.begin(), value1.end()));
-    BOOST_TEST(HASH_NAMESPACE::hash_value(value2) ==
-            HASH_NAMESPACE::hash_range(value2.begin(), value2.end()));
+    BOOST_TEST(x1(value1) == BOOST_HASH_TEST_NAMESPACE::hash_value(value1));
+    BOOST_TEST(x1(value2) == BOOST_HASH_TEST_NAMESPACE::hash_value(value2));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(value1) ==
+            BOOST_HASH_TEST_NAMESPACE::hash_range(value1.begin(), value1.end()));
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(value2) ==
+            BOOST_HASH_TEST_NAMESPACE::hash_range(value2.begin(), value2.end()));
 #endif
 }
 #endif
diff --git a/hash/test/hash_type_index_test.cpp b/hash/test/hash_type_index_test.cpp
index 27fcfff..3288a5b 100644
--- a/hash/test/hash_type_index_test.cpp
+++ b/hash/test/hash_type_index_test.cpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_STD_INCLUDES
 #  include <functional>
 #else
 #  include <boost/functional/hash.hpp>
@@ -18,7 +18,7 @@
 #include <typeindex>
 
 void test_type_index() {
-    HASH_NAMESPACE::hash<std::type_index> hasher;
+    BOOST_HASH_TEST_NAMESPACE::hash<std::type_index> hasher;
 
 #if defined(BOOST_NO_TYPEID)
     std::cout<<"Unable to test std::type_index, as typeid isn't available"
@@ -31,9 +31,9 @@ void test_type_index() {
     BOOST_TEST(hasher(int_index) == int_index.hash_code());
     BOOST_TEST(hasher(int_index) == int2_index.hash_code());
     BOOST_TEST(hasher(char_index) == char_index.hash_code());
-    BOOST_TEST(HASH_NAMESPACE::hash_value(int_index) == int_index.hash_code());
-    BOOST_TEST(HASH_NAMESPACE::hash_value(int_index) == int2_index.hash_code());
-    BOOST_TEST(HASH_NAMESPACE::hash_value(char_index) == char_index.hash_code());
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(int_index) == int_index.hash_code());
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(int_index) == int2_index.hash_code());
+    BOOST_TEST(BOOST_HASH_TEST_NAMESPACE::hash_value(char_index) == char_index.hash_code());
 
     BOOST_TEST(hasher(int_index) == hasher(int2_index));
     BOOST_TEST(hasher(int_index) != hasher(char_index));
diff --git a/hash/test/hash_value_array_test.cpp b/hash/test/hash_value_array_test.cpp
index 75dfd4f..58fc447 100644
--- a/hash/test/hash_value_array_test.cpp
+++ b/hash/test/hash_value_array_test.cpp
@@ -8,8 +8,8 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -18,7 +18,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
 
 void array_int_test()
 {
@@ -29,32 +29,32 @@ void array_int_test()
         8, -12, 23, 65, 45,
         -1, 93, -54, 987, 3
     };
-    HASH_NAMESPACE::hash<int[25]> hasher1;
+    BOOST_HASH_TEST_NAMESPACE::hash<int[25]> hasher1;
 
     int array2[1] = {3};
-    HASH_NAMESPACE::hash<int[1]> hasher2;
+    BOOST_HASH_TEST_NAMESPACE::hash<int[1]> hasher2;
 
     int array3[2] = {2, 3};
-    HASH_NAMESPACE::hash<int[2]> hasher3;
+    BOOST_HASH_TEST_NAMESPACE::hash<int[2]> hasher3;
 
-    BOOST_TEST(hasher1(array1) == HASH_NAMESPACE::hash_value(array1));
-    BOOST_TEST(hasher2(array2) == HASH_NAMESPACE::hash_value(array2));
-    BOOST_TEST(hasher3(array3) == HASH_NAMESPACE::hash_value(array3));
+    BOOST_TEST(hasher1(array1) == BOOST_HASH_TEST_NAMESPACE::hash_value(array1));
+    BOOST_TEST(hasher2(array2) == BOOST_HASH_TEST_NAMESPACE::hash_value(array2));
+    BOOST_TEST(hasher3(array3) == BOOST_HASH_TEST_NAMESPACE::hash_value(array3));
 }
 
 void two_dimensional_array_test()
 {
     int array[3][2] = {{-5, 6}, {7, -3}, {26, 1}};
-    HASH_NAMESPACE::hash<int[3][2]> hasher;
+    BOOST_HASH_TEST_NAMESPACE::hash<int[3][2]> hasher;
 
-    BOOST_TEST(hasher(array) == HASH_NAMESPACE::hash_value(array));
+    BOOST_TEST(hasher(array) == BOOST_HASH_TEST_NAMESPACE::hash_value(array));
 }
 
 #endif
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     array_int_test();
     two_dimensional_array_test();
 #endif
diff --git a/hash/test/hash_vector_test.cpp b/hash/test/hash_vector_test.cpp
index de02fe8..6dcf3b0 100644
--- a/hash/test/hash_vector_test.cpp
+++ b/hash/test/hash_vector_test.cpp
@@ -5,8 +5,8 @@
 
 #include "./config.hpp"
 
-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
+#ifdef BOOST_HASH_TEST_EXTENSIONS
+#  ifdef BOOST_HASH_TEST_STD_INCLUDES
 #    include <functional>
 #  else
 #    include <boost/functional/hash.hpp>
@@ -15,7 +15,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
 
 #include <vector>
 
@@ -23,11 +23,11 @@ using std::vector;
 #define CONTAINER_TYPE vector
 #include "./hash_sequence_test.hpp"
 
-#endif // TEST_EXTENSIONS
+#endif // BOOST_HASH_TEST_EXTENSIONS
 
 int main()
 {
-#ifdef TEST_EXTENSIONS
+#ifdef BOOST_HASH_TEST_EXTENSIONS
     vector_tests::vector_hash_integer_tests();
 #endif
 
diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp
index c0e224c..dd895aa 100644
--- a/hash/test/link_ext_test.cpp
+++ b/hash/test/link_ext_test.cpp
@@ -5,24 +5,24 @@
 
 #include "./config.hpp"
 
-#define HASH_NAMESPACE boost
+#define BOOST_HASH_TEST_NAMESPACE boost
 #include <boost/functional/hash.hpp>
 #include <boost/detail/lightweight_test.hpp>
 #include <vector>
 
 int f(std::size_t hash1, int* x1) {
 
-    // Check that HASH_NAMESPACE::hash<int*> works in both files.
-    HASH_NAMESPACE::hash<int*> ptr_hasher;
+    // Check that BOOST_HASH_TEST_NAMESPACE::hash<int*> works in both files.
+    BOOST_HASH_TEST_NAMESPACE::hash<int*> ptr_hasher;
     BOOST_TEST(hash1 == ptr_hasher(x1));
 
-#if defined(TEST_EXTENSIONS)
+#if defined(BOOST_HASH_TEST_EXTENSIONS)
 
     // Check that std::vector<std::size_t> is avaiable in this file.
     std::vector<std::size_t> x;
     x.push_back(*x1);
-    HASH_NAMESPACE::hash<std::vector<std::size_t> > vector_hasher;
-    return vector_hasher(x) != HASH_NAMESPACE::hash_value(x);
+    BOOST_HASH_TEST_NAMESPACE::hash<std::vector<std::size_t> > vector_hasher;
+    return vector_hasher(x) != BOOST_HASH_TEST_NAMESPACE::hash_value(x);
     
 #else
 
diff --git a/hash/test/link_no_ext_test.cpp b/hash/test/link_no_ext_test.cpp
index c2e6869..75cd47d 100644
--- a/hash/test/link_no_ext_test.cpp
+++ b/hash/test/link_no_ext_test.cpp
@@ -5,7 +5,7 @@
 
 #include "./config.hpp"
 
-#define HASH_NAMESPACE boost
+#define BOOST_HASH_TEST_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
 #include <boost/detail/lightweight_test.hpp>
@@ -13,7 +13,7 @@
 extern int f(std::size_t, int*);
 
 int main() {
-    HASH_NAMESPACE::hash<int*> ptr_hasher;
+    BOOST_HASH_TEST_NAMESPACE::hash<int*> ptr_hasher;
     int x = 55;
     BOOST_TEST(!f(ptr_hasher(&x), &x));
     return boost::report_errors();

From 33e11b79e44bb57dbfbe002aa99140b172cba614 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 29 Dec 2012 11:11:43 +0000
Subject: [PATCH 102/111] Hash: Merge UB fix to release.

[SVN r82256]
---
 hash/doc/changes.qbk                                | 1 +
 include/boost/functional/hash/detail/hash_float.hpp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index b20e58d..2a37d5d 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -150,5 +150,6 @@
 * On platforms that are known to have standard floating point, don't use the
   automatic detection of floating point functions - which can break if there
   are ambiguous overloads.
+* Fix undefined behaviour when using the binary float hash (Thomas Heller).
 
 [endsect]
diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/functional/hash/detail/hash_float.hpp
index 5e20b9c..a98cd70 100644
--- a/include/boost/functional/hash/detail/hash_float.hpp
+++ b/include/boost/functional/hash/detail/hash_float.hpp
@@ -73,7 +73,9 @@ namespace boost
                 ptr += sizeof(std::size_t);
 
                 while(length >= sizeof(std::size_t)) {
-                    hash_float_combine(seed, *(std::size_t*) ptr);
+                    std::size_t buffer = 0;
+                    std::memcpy(&buffer, ptr, sizeof(std::size_t));
+                    hash_float_combine(seed, buffer);
                     length -= sizeof(std::size_t);
                     ptr += sizeof(std::size_t);
                 }

From f3f75a101d36b87e2221e32423633b773e47912b Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 12 Feb 2013 00:19:56 +0000
Subject: [PATCH 103/111] Hash: Merge documentation fixes. Fixes #7957.

[SVN r82827]
---
 hash/doc/changes.qbk   | 13 ++++++++-----
 hash/doc/rationale.qbk |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 2a37d5d..2334b15 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -142,14 +142,17 @@
 [h2 Boost 1.52.0]
 
 * Restore `enum` support, which was accidentally removed in the last version.
+* New floating point hasher - will hash the binary representation on more
+  platforms, which should be faster.
+
+[h2 Boost 1.53.0]
+
 * Add support for `boost::int128_type` and `boost::uint128_type` where
   available - currently only `__int128` and `unsigned __int128` on some
   versions of gcc.
-* New floating point hasher - will hash the binary representation on more
-  platforms, which should be faster.
-* On platforms that are known to have standard floating point, don't use the
-  automatic detection of floating point functions - which can break if there
-  are ambiguous overloads.
+* On platforms that are known to have the standard floating point functions,
+  don't use automatic detection - which can break if there are ambiguous
+  overloads.
 * Fix undefined behaviour when using the binary float hash (Thomas Heller).
 
 [endsect]
diff --git a/hash/doc/rationale.qbk b/hash/doc/rationale.qbk
index ab03d8b..8621081 100644
--- a/hash/doc/rationale.qbk
+++ b/hash/doc/rationale.qbk
@@ -38,7 +38,7 @@ function, such as [@http://www.concentric.net/~ttwang/tech/inthash.htm
 Thomas Wang's hash function]. This this may not work as
 well as a hash algorithm tailored for the input.
 
-For strings that are several fast, high quality hash functions
+For strings there are several fast, high quality hash functions
 available (for example [@http://code.google.com/p/smhasher/ MurmurHash3]
 and [@http://code.google.com/p/cityhash/ Google's CityHash]),
 although they tend to be more machine specific.

From eebb4df856253c8170f61a9d2b23d202ae4e85dd Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 25 May 2013 15:53:49 +0000
Subject: [PATCH 104/111] Merge some change log entries to release.

[SVN r84497]
---
 hash/doc/changes.qbk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 2334b15..4ca0814 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -155,4 +155,9 @@
   overloads.
 * Fix undefined behaviour when using the binary float hash (Thomas Heller).
 
+[h2 Boost 1.54.0]
+
+* [@https://svn.boost.org/trac/boost/ticket/7957 Ticket 7957]:
+  Fixed a typo.
+
 [endsect]

From b271abdda3f96408a9b3bf76a08cf5e5d9d9c2d2 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 3 Jun 2013 22:13:57 +0000
Subject: [PATCH 105/111] Fully merge all of functional (including sublibs).

Should be just documentation and metadata changes. There might be a problem
witht he generated documentation for overloaded_function, if so I'll fix it
very soon.


[SVN r84625]
---
 factory/doc/factory.qbk                       |  36 +-
 factory/doc/html/boostbook.css                | 528 ---------------
 factory/doc/html/index.html                   | 608 +-----------------
 forward/doc/html/boostbook.css                | 528 ---------------
 forward/doc/html/index.html                   | 574 +----------------
 ..._OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html |   4 +-
 ...ERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html |  10 +-
 .../html/boost/make_overloaded_function.html  |   6 +-
 .../doc/html/boost/overloaded_function.html   |  24 +-
 ...nowledgments.html => acknowledgments.html} |   4 +-
 ...ting_Started.html => getting_started.html} |  22 +-
 .../{Tutorial.html => tutorial.html}          |  30 +-
 overloaded_function/doc/html/index.html       |  32 +-
 overloaded_function/doc/html/reference.html   |   6 +-
 14 files changed, 114 insertions(+), 2298 deletions(-)
 delete mode 100644 factory/doc/html/boostbook.css
 delete mode 100644 forward/doc/html/boostbook.css
 rename overloaded_function/doc/html/boost_functional_overloadedfunction/{Acknowledgments.html => acknowledgments.html} (95%)
 rename overloaded_function/doc/html/boost_functional_overloadedfunction/{Getting_Started.html => getting_started.html} (82%)
 rename overloaded_function/doc/html/boost_functional_overloadedfunction/{Tutorial.html => tutorial.html} (93%)

diff --git a/factory/doc/factory.qbk b/factory/doc/factory.qbk
index 487537c..7aa3faf 100644
--- a/factory/doc/factory.qbk
+++ b/factory/doc/factory.qbk
@@ -23,15 +23,17 @@
 [def __boost_function__ [@http://www.boost.org/doc/html/function.html Boost.Function]]
 [def __boost__function__ [@http://www.boost.org/doc/html/function.html `boost::function`]]
 
+[def __smart_pointer__ [@http://www.boost.org/libs/smart_ptr/index.html Smart Pointer]]
 [def __smart_pointers__ [@http://www.boost.org/libs/smart_ptr/index.html Smart Pointers]]
 [def __boost__shared_ptr__ [@http://www.boost.org/libs/smart_ptr/shared_ptr.htm `boost::shared_ptr`]]
 
 [def __std__map__ [@http://www.sgi.com/tech/stl/map.html `std::map`]]
 [def __std__string__ [@http://www.sgi.com/tech/stl/string.html `std::string`]]
+[def __allocator__ [@http://www.sgi.com/tech/stl/concepts/allocator.html Allocator]]
 [def __std_allocator__ [@http://www.sgi.com/tech/stl/concepts/allocator.html Allocator]]
 [def __std_allocators__ [@http://www.sgi.com/tech/stl/concepts/allocator.html Allocators]]
 
-[def __boost__ptr_map__ [@http://www.boost.org/libs/ptr_container/doc/ptr_map.html `__boost__ptr_map__`]]
+[def __boost__ptr_map__ [@http://www.boost.org/libs/ptr_container/doc/ptr_map.html `boost::ptr_map`]]
 
 [def __boost__factory__ `boost::factory`]
 [def __boost__value_factory__ `boost::value_factory`]
@@ -107,7 +109,7 @@ interfaces.
 
         // [...]
 
-        std::auto_ptr<an_abstract_factory> x = factories[some_name]->create();
+        std::auto_ptr<an_abstract_class> x(factories.at(some_name).create());
 
         // [...]
     }
@@ -117,30 +119,30 @@ lots of boilerplate code. In other words there is too much code to express
 a rather simple intention. We could use templates to get rid of some of it
 but the approach remains inflexible: 
 
- o We may want a factory that takes some arguments that are forwarded to
-   the constructor,
- o we will probably want to use smart pointers,
- o we may want several member functions to create different kinds of
-   objects,
- o we might not necessarily need a polymorphic base class for the objects,
- o as we will see, we do not need a factory base class at all, 
- o we might want to just call the constructor - without `new` to create
-   an object on the stack, and
- o finally we might want to use customized memory management.
+* We may want a factory that takes some arguments that are forwarded to
+  the constructor,
+* we will probably want to use smart pointers,
+* we may want several member functions to create different kinds of
+  objects,
+* we might not necessarily need a polymorphic base class for the objects,
+* as we will see, we do not need a factory base class at all, 
+* we might want to just call the constructor - without `new` to create
+  an object on the stack, and
+* finally we might want to use customized memory management.
 
 Experience has shown that using function objects and generic Boost components
-for their composition, Design Patterns that describe callback mechasisms
+for their composition, Design Patterns that describe callback mechanisms
 (typically requiring a high percentage of boilerplate code with pure Object
 Oriented methodology) become implementable with just few code lines and without
 extra classes. 
 
 Factories are callback mechanisms for constructors, so we provide two class
-templates, __boost__value_factory__ and __boost__factory__, that encasulate
+templates, __boost__value_factory__ and __boost__factory__, that encapsulate
 object construction via direct application of the constructor and the `new`
 operator, respectively. 
 
 We let the function objects forward their arguments to the construction
-expressions they encapsulate. Overthis __boost__factory__ optionally allows 
+expressions they encapsulate. Over this __boost__factory__ optionally allows
 the use of smart pointers and __std_allocators__.
 
 Compile-time polymorphism can be used where appropriate,
@@ -156,7 +158,7 @@ Compile-time polymorphism can be used where appropriate,
         // [...]
     }
 
-Now, to allow inhomogenous signaturs for the constructors of the types passed 
+Now, to allow inhomogeneous signatures for the constructors of the types passed
 in for `T` we can use __value_factory__ and __boost__bind__ to normalize between
 them. 
 
@@ -299,7 +301,7 @@ constructor, such as __boost__shared_ptr__).
 If a third template argument is `factory_passes_alloc_to_smart_pointer`,
 the allocator itself is used for the third constructor argument of `Pointer`
 (__boost__shared_ptr__ then uses the allocator to manage the memory of its
-seperately allocated reference counter).
+separately allocated reference counter).
 
 [heading Header]
     #include <boost/functional/factory.hpp>
diff --git a/factory/doc/html/boostbook.css b/factory/doc/html/boostbook.css
deleted file mode 100644
index 858d43c..0000000
--- a/factory/doc/html/boostbook.css
+++ /dev/null
@@ -1,528 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2004 Joel de Guzman
-    http://spirit.sourceforge.net/
-
-    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)
-=============================================================================*/
-
-/*=============================================================================
-    Body defaults
-=============================================================================*/
-
-    body
-    {
-        margin: 1em;
-        font-family: sans-serif;
-    }
-
-/*=============================================================================
-    Paragraphs
-=============================================================================*/
-
-    p
-    {
-        text-align: left;
-        font-size: 10pt;
-        line-height: 1.15;
-    }
-
-/*=============================================================================
-    Program listings
-=============================================================================*/
-
-    /* Code on paragraphs */
-    p tt.computeroutput
-    {
-        font-size: 9pt;
-    }
-
-    pre.synopsis
-    {
-        font-size: 90%;
-        margin: 1pc 4% 0pc 4%;
-        padding: 0.5pc 0.5pc 0.5pc 0.5pc;
-    }
-
-    .programlisting,
-    .screen
-    {
-        font-size: 9pt;
-        display: block;
-        margin: 1pc 4% 0pc 4%;
-        padding: 0.5pc 0.5pc 0.5pc 0.5pc;
-    }
-
-    /* Program listings in tables don't get borders */
-    td .programlisting,
-    td .screen
-    {
-        margin: 0pc 0pc 0pc 0pc;
-        padding:  0pc 0pc 0pc 0pc;
-    }
-
-/*=============================================================================
-    Headings
-=============================================================================*/
-
-    h1, h2, h3, h4, h5, h6
-    {
-        text-align: left;
-        margin: 1em 0em 0.5em 0em;
-        font-weight: bold;
-    }
-
-    h1 { font: 140% }
-    h2 { font: bold 140% }
-    h3 { font: bold 130% }
-    h4 { font: bold 120% }
-    h5 { font: italic 110% }
-    h6 { font: italic 100% }
-
-    /* Top page titles */
-    title,
-    h1.title,
-    h2.title
-    h3.title,
-    h4.title,
-    h5.title,
-    h6.title,
-    .refentrytitle
-    {
-        font-weight: bold;
-        margin-bottom: 1pc;
-    }
-
-    h1.title { font-size: 140% }
-    h2.title { font-size: 140% }
-    h3.title { font-size: 130% }
-    h4.title { font-size: 120% }
-    h5.title { font-size: 110% }
-    h6.title { font-size: 100% }
-
-    .section h1
-    {
-        margin: 0em 0em 0.5em 0em;
-        font-size: 140%;
-    }
-
-    .section h2 { font-size: 140% }
-    .section h3 { font-size: 130% }
-    .section h4 { font-size: 120% }
-    .section h5 { font-size: 110% }
-    .section h6 { font-size: 100% }
-
-    /* Code on titles */
-    h1 tt.computeroutput { font-size: 140% }
-    h2 tt.computeroutput { font-size: 140% }
-    h3 tt.computeroutput { font-size: 130% }
-    h4 tt.computeroutput { font-size: 120% }
-    h5 tt.computeroutput { font-size: 110% }
-    h6 tt.computeroutput { font-size: 100% }
-
-/*=============================================================================
-    Author
-=============================================================================*/
-
-    h3.author
-    {
-        font-size: 100%
-    }
-
-/*=============================================================================
-    Lists
-=============================================================================*/
-
-    li
-    {
-        font-size: 10pt;
-        line-height: 1.3;
-    }
-
-    /* Unordered lists */
-    ul
-    {
-        text-align: left;
-    }
-
-    /* Ordered lists */
-    ol
-    {
-        text-align: left;
-    }
-
-/*=============================================================================
-    Links
-=============================================================================*/
-
-    a
-    {
-        text-decoration: none; /* no underline */
-    }
-
-    a:hover
-    {
-        text-decoration: underline;
-    }
-
-/*=============================================================================
-    Spirit style navigation
-=============================================================================*/
-
-    .spirit-nav
-    {
-        text-align: right;
-    }
-
-    .spirit-nav a
-    {
-        color: white;
-        padding-left: 0.5em;
-    }
-
-    .spirit-nav img
-    {
-        border-width: 0px;
-    }
-
-/*=============================================================================
-    Table of contents
-=============================================================================*/
-
-    .toc
-    {
-       margin: 1pc 4% 0pc 4%;
-       padding: 0.1pc 1pc 0.1pc 1pc;
-       font-size: 80%;
-       line-height: 1.15;
-    }
-
-    .boost-toc
-    {
-       float: right;
-       padding: 0.5pc;
-    }
-
-/*=============================================================================
-    Tables
-=============================================================================*/
-
-    .table-title,
-    div.table p.title
-    {
-        margin-left: 4%;
-        padding-right: 0.5em;
-        padding-left: 0.5em;
-    }
-
-    .informaltable table,
-    .table table
-    {
-        width: 92%;
-        margin-left: 4%;
-        margin-right: 4%;
-    }
-
-    div.informaltable table,
-    div.table table
-    {
-        padding: 4px;
-    }
-
-    /* Table Cells */
-    div.informaltable table tr td,
-    div.table table tr td
-    {
-        padding: 0.5em;
-        text-align: left;
-        font-size: 9pt;
-    }
-
-    div.informaltable table tr th,
-    div.table table tr th
-    {
-        padding: 0.5em 0.5em 0.5em 0.5em;
-        border: 1pt solid white;
-        font-size: 80%;
-    }
-
-/*=============================================================================
-    Blurbs
-=============================================================================*/
-
-    div.note,
-    div.tip,
-    div.important,
-    div.caution,
-    div.warning,
-    div.sidebar
-    {
-        font-size: 9pt; /* A little bit smaller than the main text */
-        line-height: 1.2;
-        display: block;
-        margin: 1pc 4% 0pc 4%;
-        padding: 0.5pc 0.5pc 0.0pc 0.5pc;
-    }
-
-    div.sidebar img
-    {
-        padding: 1pt;
-    }
-
-/*=============================================================================
-    Callouts
-=============================================================================*/
-    .line_callout_bug img
-    {
-        float: left;
-        position:relative;
-        left: 4px;
-        top: -12px;
-        clear: left;
-        margin-left:-22px;
-    }
-
-    .callout_bug img
-    {
-    }
-
-/*=============================================================================
-    Variable Lists
-=============================================================================*/
-
-    /* Make the terms in definition lists bold */
-    div.variablelist dl dt,
-    span.term
-    {
-        font-weight: bold;
-        font-size: 10pt;
-    }
-
-    div.variablelist table tbody tr td
-    {
-        text-align: left;
-        vertical-align: top;
-        padding: 0em 2em 0em 0em;
-        font-size: 10pt;
-        margin: 0em 0em 0.5em 0em;
-        line-height: 1;
-    }
-
-    div.variablelist dl dt
-    {
-        margin-bottom: 0.2em;
-    }
-
-    div.variablelist dl dd
-    {
-        margin: 0em 0em 0.5em 2em;
-        font-size: 10pt;
-    }
-
-    div.variablelist table tbody tr td p,
-    div.variablelist dl dd p
-    {
-        margin: 0em 0em 0.5em 0em;
-        line-height: 1;
-    }
-
-/*=============================================================================
-    Misc
-=============================================================================*/
-
-    /* Title of books and articles in bibliographies */
-    span.title
-    {
-        font-style: italic;
-    }
-
-    span.underline
-    {
-        text-decoration: underline;
-    }
-
-    span.strikethrough
-    {
-        text-decoration: line-through;
-    }
-
-    /* Copyright, Legal Notice */
-    div div.legalnotice p
-    {
-        text-align: left
-    }
-
-/*=============================================================================
-    Colors
-=============================================================================*/
-
-    @media screen
-    {
-    /* Links */
-        a
-        {
-            color: #005a9c;
-        }
-
-        a:visited
-        {
-            color: #9c5a9c;
-        }
-
-        h1 a, h2 a, h3 a, h4 a, h5 a, h6 a,
-        h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover,
-        h1 a:visited, h2 a:visited, h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited
-        {
-            text-decoration: none; /* no underline */
-            color: #000000;
-        }
-
-    /* Syntax Highlighting */
-        .keyword        { color: #0000AA; }
-        .identifier     { color: #000000; }
-        .special        { color: #707070; }
-        .preprocessor   { color: #402080; }
-        .char           { color: teal; }
-        .comment        { color: #800000; }
-        .string         { color: teal; }
-        .number         { color: teal; }
-        .white_bkd      { background-color: #FFFFFF; }
-        .dk_grey_bkd    { background-color: #999999; }
-
-    /* Copyright, Legal Notice */
-        .copyright
-        {
-            color: #666666;
-            font-size: small;
-        }
-
-        div div.legalnotice p
-        {
-            color: #666666;
-        }
-
-    /* Program listing */
-        pre.synopsis
-        {
-            border: 1px solid #DCDCDC;
-        }
-
-        .programlisting,
-        .screen
-        {
-            border: 1px solid #DCDCDC;
-        }
-
-        td .programlisting,
-        td .screen
-        {
-            border: 0px solid #DCDCDC;
-        }
-
-    /* Blurbs */
-        div.note,
-        div.tip,
-        div.important,
-        div.caution,
-        div.warning,
-        div.sidebar
-        {
-            border: 1px solid #DCDCDC;
-        }
-
-    /* Table of contents */
-        .toc
-        {
-            border: 1px solid #DCDCDC;
-        }
-
-    /* Tables */
-        div.informaltable table tr td,
-        div.table table tr td
-        {
-            border: 1px solid #DCDCDC;
-        }
-
-        div.informaltable table tr th,
-        div.table table tr th
-        {
-            background-color: #F0F0F0;
-            border: 1px solid #DCDCDC;
-        }
-
-    /* Misc */
-        span.highlight
-        {
-            color: #00A000;
-        }
-    }
-
-    @media print
-    {
-    /* Links */
-        a
-        {
-            color: black;
-        }
-
-        a:visited
-        {
-            color: black;
-        }
-
-        .spirit-nav
-        {
-            display: none;
-        }
-
-    /* Program listing */
-        pre.synopsis
-        {
-            border: 1px solid gray;
-        }
-
-        .programlisting,
-        .screen
-        {
-            border: 1px solid gray;
-        }
-
-        td .programlisting,
-        td .screen
-        {
-            border: 0px solid #DCDCDC;
-        }
-
-    /* Table of contents */
-        .toc
-        {
-            border: 1px solid gray;
-        }
-
-        .informaltable table,
-        .table table
-        {
-            border: 1px solid gray;
-            border-collapse: collapse;
-        }
-
-    /* Tables */
-        div.informaltable table tr td,
-        div.table table tr td
-        {
-            border: 1px solid gray;
-        }
-
-        div.informaltable table tr th,
-        div.table table tr th
-        {
-            border: 1px solid gray;
-        }
-
-    /* Misc */
-        span.highlight
-        {
-            font-weight: bold;
-        }
-    }
diff --git a/factory/doc/html/index.html b/factory/doc/html/index.html
index 93ce15f..83a3266 100644
--- a/factory/doc/html/index.html
+++ b/factory/doc/html/index.html
@@ -1,598 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Chapter 1. Boost.Functional/Factory 1.0</title>
-<link rel="stylesheet" href="boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="Chapter 1. Boost.Functional/Factory 1.0">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav"></div>
-<div class="chapter" lang="en">
-<div class="titlepage"><div>
-<div><h2 class="title">
-<a name="boost_functional_factory"></a>Chapter 1. Boost.Functional/Factory 1.0</h2></div>
-<div><div class="author"><h3 class="author">
-<span class="firstname">Tobias</span> <span class="surname">Schwinger</span>
-</h3></div></div>
-<div><p class="copyright">Copyright © 2007, 2008 Tobias Schwinger</p></div>
-<div><div class="legalnotice">
-<a name="id934161"></a><p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></div>
-</div></div>
-<div class="toc">
-<p><b>Table of Contents</b></p>
-<dl>
-<dt><span class="section"><a href="index.html#boost_functional_factory.brief_description">Brief Description</a></span></dt>
-<dt><span class="section"><a href="index.html#boost_functional_factory.background">Background</a></span></dt>
-<dt><span class="section"><a href="index.html#boost_functional_factory.reference"> Reference</a></span></dt>
-<dt><span class="section"><a href="index.html#boost_functional_factory.acknowledgements">Acknowledgements</a></span></dt>
-<dt><span class="section"><a href="index.html#boost_functional_factory.references">References</a></span></dt>
-</dl>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_factory.brief_description"></a><a href="index.html#boost_functional_factory.brief_description" title="Brief Description">Brief Description</a></h2></div></div></div>
-<p>
-      The template <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">factory</span></code> lets you encapsulate a <code class="computeroutput"><span class="keyword">new</span></code> expression as a function object, <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">value_factory</span></code>
-      encapsulates a constructor invocation without <code class="computeroutput"><span class="keyword">new</span></code>.
-    </p>
-<pre class="programlisting"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">factory</span></code><span class="special">&lt;</span><span class="identifier">T</span><span class="special">*&gt;()(</span><span class="identifier">arg1</span><span class="special">,</span><span class="identifier">arg2</span><span class="special">,</span><span class="identifier">arg3</span><span class="special">)</span> 
-<span class="comment">// same as new T(arg1,arg2,arg3)
-</span>
-<code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">value_factory</span></code><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;()(</span><span class="identifier">arg1</span><span class="special">,</span><span class="identifier">arg2</span><span class="special">,</span><span class="identifier">arg3</span><span class="special">)</span>
-<span class="comment">// same as T(arg1,arg2,arg3)
-</span></pre>
-<p>
-      For technical reasons the arguments to the function objects have to be LValues.
-      A factory that also accepts RValues can be composed using the <a href="http://www.boost.org/libs/functional/forward/doc/index.html" target="_top"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">forward_adapter</span></code></a>
-      or <a href="http://www.boost.org/libs/bind/bind.html" target="_top"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span></code></a>.
-    </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_factory.background"></a><a href="index.html#boost_functional_factory.background" title="Background">Background</a></h2></div></div></div>
-<p>
-      In traditional Object Oriented Programming a Factory is an object implementing
-      an interface of one or more methods that construct objects conforming to known
-      interfaces.
-    </p>
-<pre class="programlisting"><span class="comment">// assuming a_concrete_class and another_concrete_class are derived
-</span><span class="comment">// from an_abstract_class
-</span>
-<span class="keyword">class</span> <span class="identifier">a_factory</span>
-<span class="special">{</span>
-  <span class="keyword">public</span><span class="special">:</span>
-    <span class="keyword">virtual</span> <span class="identifier">an_abstract_class</span><span class="special">*</span> <span class="identifier">create</span><span class="special">()</span> <span class="keyword">const</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-    <span class="keyword">virtual</span> <span class="special">~</span><span class="identifier">a_factory</span><span class="special">()</span> <span class="special">{</span> <span class="special">}</span>
-<span class="special">};</span>
+  <head>
+  <!-- Copyright (C) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
 
-<span class="keyword">class</span> <span class="identifier">a_concrete_factory</span> <span class="special">:</span> <span class="keyword">public</span> <span class="identifier">a_factory</span>
-<span class="special">{</span>
-  <span class="keyword">public</span><span class="special">:</span>
-    <span class="keyword">virtual</span> <span class="identifier">an_abstract_class</span><span class="special">*</span> <span class="identifier">create</span><span class="special">()</span> <span class="keyword">const</span>
-    <span class="special">{</span>
-        <span class="keyword">return</span> <span class="keyword">new</span> <span class="identifier">a_concrete_class</span><span class="special">();</span>
-    <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="keyword">class</span> <span class="identifier">another_concrete_factory</span> <span class="special">:</span> <span class="keyword">public</span> <span class="identifier">a_factory</span>
-<span class="special">{</span>
-  <span class="keyword">public</span><span class="special">:</span>
-    <span class="keyword">virtual</span> <span class="identifier">an_abstract_class</span><span class="special">*</span> <span class="identifier">create</span><span class="special">()</span> <span class="keyword">const</span>
-    <span class="special">{</span>
-        <span class="keyword">return</span> <span class="keyword">new</span> <span class="identifier">another_concrete_class</span><span class="special">();</span>
-    <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="comment">// [...]
-</span>
-<span class="keyword">int</span> <span class="identifier">main</span><span class="special">()</span>
-<span class="special">{</span>
-    <a href="http://www.boost.org/libs/ptr_container/doc/ptr_map.html" target="_top"><code class="computeroutput"><span class="identifier">__boost__ptr_map__</span></code></a><span class="special">&lt;</span><a href="http://www.sgi.com/tech/stl/string.html" target="_top"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span></code></a><span class="special">,</span><span class="identifier">a_factory</span><span class="special">&gt;</span> <span class="identifier">factories</span><span class="special">;</span>
-
-    <span class="comment">// [...]
-</span>
-    <span class="identifier">factories</span><span class="special">.</span><span class="identifier">insert</span><span class="special">(</span><span class="string">"a_name"</span><span class="special">,</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">auto_ptr</span><span class="special">&lt;</span><span class="identifier">a_factory</span><span class="special">&gt;(</span>
-        <span class="keyword">new</span> <span class="identifier">a_concrete_factory</span><span class="special">));</span>
-    <span class="identifier">factories</span><span class="special">.</span><span class="identifier">insert</span><span class="special">(</span><span class="string">"another_name"</span><span class="special">,</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">auto_ptr</span><span class="special">&lt;</span><span class="identifier">a_factory</span><span class="special">&gt;(</span>
-        <span class="keyword">new</span> <span class="identifier">another_concrete_factory</span><span class="special">));</span>
-
-    <span class="comment">// [...]
-</span>
-    <span class="identifier">std</span><span class="special">::</span><span class="identifier">auto_ptr</span><span class="special">&lt;</span><span class="identifier">an_abstract_factory</span><span class="special">&gt;</span> <span class="identifier">x</span> <span class="special">=</span> <span class="identifier">factories</span><span class="special">[</span><span class="identifier">some_name</span><span class="special">]-&gt;</span><span class="identifier">create</span><span class="special">();</span>
-
-    <span class="comment">// [...]
-</span><span class="special">}</span>
-</pre>
-<p>
-      This approach has several drawbacks. The most obvious one is that there is
-      lots of boilerplate code. In other words there is too much code to express
-      a rather simple intention. We could use templates to get rid of some of it
-      but the approach remains inflexible:
-    </p>
-<pre class="programlisting"><span class="identifier">o</span> <span class="identifier">We</span> <span class="identifier">may</span> <span class="identifier">want</span> <span class="identifier">a</span> <span class="identifier">factory</span> <span class="identifier">that</span> <span class="identifier">takes</span> <span class="identifier">some</span> <span class="identifier">arguments</span> <span class="identifier">that</span> <span class="identifier">are</span> <span class="identifier">forwarded</span> <span class="identifier">to</span>
-  <span class="identifier">the</span> <span class="identifier">constructor</span><span class="special">,</span>
-<span class="identifier">o</span> <span class="identifier">we</span> <span class="identifier">will</span> <span class="identifier">probably</span> <span class="identifier">want</span> <span class="identifier">to</span> <span class="identifier">use</span> <span class="identifier">smart</span> <span class="identifier">pointers</span><span class="special">,</span>
-<span class="identifier">o</span> <span class="identifier">we</span> <span class="identifier">may</span> <span class="identifier">want</span> <span class="identifier">several</span> <span class="identifier">member</span> <span class="identifier">functions</span> <span class="identifier">to</span> <span class="identifier">create</span> <span class="identifier">different</span> <span class="identifier">kinds</span> <span class="identifier">of</span>
-  <span class="identifier">objects</span><span class="special">,</span>
-<span class="identifier">o</span> <span class="identifier">we</span> <span class="identifier">might</span> <span class="keyword">not</span> <span class="identifier">necessarily</span> <span class="identifier">need</span> <span class="identifier">a</span> <span class="identifier">polymorphic</span> <span class="identifier">base</span> <span class="keyword">class</span> <span class="keyword">for</span> <span class="identifier">the</span> <span class="identifier">objects</span><span class="special">,</span>
-<span class="identifier">o</span> <span class="identifier">as</span> <span class="identifier">we</span> <span class="identifier">will</span> <span class="identifier">see</span><span class="special">,</span> <span class="identifier">we</span> <span class="keyword">do</span> <span class="keyword">not</span> <span class="identifier">need</span> <span class="identifier">a</span> <span class="identifier">factory</span> <span class="identifier">base</span> <span class="keyword">class</span> <span class="identifier">at</span> <span class="identifier">all</span><span class="special">,</span> 
-<span class="identifier">o</span> <span class="identifier">we</span> <span class="identifier">might</span> <span class="identifier">want</span> <span class="identifier">to</span> <span class="identifier">just</span> <span class="identifier">call</span> <span class="identifier">the</span> <span class="identifier">constructor</span> <span class="special">-</span> <span class="identifier">without</span> #<span class="keyword">new</span># <span class="identifier">to</span> <span class="identifier">create</span>
-  <span class="identifier">an</span> <span class="identifier">object</span> <span class="identifier">on</span> <span class="identifier">the</span> <span class="identifier">stack</span><span class="special">,</span> <span class="keyword">and</span>
-<span class="identifier">o</span> <span class="identifier">finally</span> <span class="identifier">we</span> <span class="identifier">might</span> <span class="identifier">want</span> <span class="identifier">to</span> <span class="identifier">use</span> <span class="identifier">customized</span> <span class="identifier">memory</span> <span class="identifier">management</span><span class="special">.</span>
-</pre>
-<p>
-      Experience has shown that using function objects and generic Boost components
-      for their composition, Design Patterns that describe callback mechasisms (typically
-      requiring a high percentage of boilerplate code with pure Object Oriented methodology)
-      become implementable with just few code lines and without extra classes.
-    </p>
-<p>
-      Factories are callback mechanisms for constructors, so we provide two class
-      templates, <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">value_factory</span></code> and <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">factory</span></code>,
-      that encasulate object construction via direct application of the constructor
-      and the <code class="computeroutput"><span class="keyword">new</span></code> operator, respectively.
-    </p>
-<p>
-      We let the function objects forward their arguments to the construction expressions
-      they encapsulate. Overthis <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">factory</span></code>
-      optionally allows the use of smart pointers and <a href="http://www.sgi.com/tech/stl/concepts/allocator.html" target="_top">Allocators</a>.
-    </p>
-<p>
-      Compile-time polymorphism can be used where appropriate,
-    </p>
-<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">class</span> <span class="identifier">T</span> <span class="special">&gt;</span>
-<span class="keyword">void</span> <span class="identifier">do_something</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="comment">// [...]
-</span>    <span class="identifier">T</span> <span class="identifier">x</span> <span class="special">=</span> <span class="identifier">T</span><span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">);</span>
-
-    <span class="comment">// for conceptually similar objects x we neither need virtual
-</span>    <span class="comment">// functions nor a common base class in this context.
-</span>    <span class="comment">// [...]
-</span><span class="special">}</span>
-</pre>
-<p>
-      Now, to allow inhomogenous signaturs for the constructors of the types passed
-      in for <code class="computeroutput"><span class="identifier">T</span></code> we can use <code class="computeroutput"><span class="identifier">value_factory</span></code> and <a href="http://www.boost.org/libs/bind/bind.html" target="_top"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span></code></a>
-      to normalize between them.
-    </p>
-<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">class</span> <span class="identifier">ValueFactory</span> <span class="special">&gt;</span> 
-<span class="keyword">void</span> <span class="identifier">do_something</span><span class="special">(</span><span class="identifier">ValueFactory</span> <span class="identifier">make_obj</span> <span class="special">=</span> <span class="identifier">ValueFactory</span><span class="special">())</span>
-<span class="special">{</span>
-    <span class="comment">// [...]
-</span>    <span class="keyword">typename</span> <span class="identifier">ValueFactory</span><span class="special">::</span><span class="identifier">result_type</span> <span class="identifier">x</span> <span class="special">=</span> <span class="identifier">make_obj</span><span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">);</span>
-
-    <span class="comment">// for conceptually similar objects x we neither need virtual
-</span>    <span class="comment">// functions nor a common base class in this context.
-</span>    <span class="comment">// [...]
-</span><span class="special">}</span>
-
-<span class="keyword">int</span> <span class="identifier">main</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="comment">// [...]
-</span>
-    <span class="identifier">do_something</span><span class="special">(</span><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">value_factory</span></code><span class="special">&lt;</span><span class="identifier">X</span><span class="special">&gt;());</span>
-    <span class="identifier">do_something</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">value_factory</span></code><span class="special">&lt;</span><span class="identifier">Y</span><span class="special">&gt;(),</span><span class="identifier">_1</span><span class="special">,</span><span class="number">5</span><span class="special">,</span><span class="identifier">_2</span><span class="special">));</span>
-    <span class="comment">// construct X(a,b) and Y(a,5,b), respectively.
-</span>
-    <span class="comment">// [...]
-</span><span class="special">}</span>
-</pre>
-<p>
-      Maybe we want our objects to outlive the function's scope, in this case we
-      have to use dynamic allocation;
-    </p>
-<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">class</span> <span class="identifier">Factory</span> <span class="special">&gt;</span>
-<span class="identifier">whatever</span> <span class="identifier">do_something</span><span class="special">(</span><span class="identifier">Factory</span> <span class="identifier">new_obj</span> <span class="special">=</span> <span class="identifier">Factory</span><span class="special">())</span>
-<span class="special">{</span>
-    <span class="keyword">typename</span> <span class="identifier">Factory</span><span class="special">::</span><span class="identifier">result_type</span> <span class="identifier">ptr</span> <span class="special">=</span> <span class="identifier">new_obj</span><span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">);</span>
-
-    <span class="comment">// again, no common base class or virtual functions needed,
-</span>    <span class="comment">// we could enforce a polymorphic base by writing e.g.
-</span>    <span class="comment">//    boost::shared_ptr&lt;base&gt;
-</span>    <span class="comment">// instead of
-</span>    <span class="comment">//    typename Factory::result_type
-</span>    <span class="comment">// above.
-</span>    <span class="comment">// Note that we are also free to have the type erasure happen 
-</span>    <span class="comment">// somewhere else (e.g. in the constructor of this function's
-</span>    <span class="comment">// result type).
-</span>
-    <span class="comment">// [...]
-</span><span class="special">}</span>
-
-<span class="comment">// [... call do_something like above but with __factory__ instead
-</span><span class="comment">// of __value_factory__]
-</span></pre>
-<p>
-      Although we might have created polymorphic objects in the previous example,
-      we have used compile time polymorphism for the factory. If we want to erase
-      the type of the factory and thus allow polymorphism at run time, we can use
-      <a href="http://www.boost.org/doc/html/function.html" target="_top">Boost.Function</a>
-      to do so. The first example can be rewritten as follows.
-    </p>
-<pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="identifier">an_abstract_class</span><span class="special">*()</span> <span class="special">&gt;</span> <span class="identifier">a_factory</span><span class="special">;</span>
-
-<span class="comment">// [...]
-</span>
-<span class="keyword">int</span> <span class="identifier">main</span><span class="special">()</span>
-<span class="special">{</span>
-    <a href="http://www.sgi.com/tech/stl/map.html" target="_top"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">map</span></code></a><span class="special">&lt;</span><a href="http://www.sgi.com/tech/stl/string.html" target="_top"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span></code></a><span class="special">,</span><span class="identifier">a_factory</span><span class="special">&gt;</span> <span class="identifier">factories</span><span class="special">;</span>
-
-    <span class="comment">// [...]
-</span>
-    <span class="identifier">factories</span><span class="special">[</span><span class="string">"a_name"</span><span class="special">]</span> <span class="special">=</span> <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">factory</span></code><span class="special">&lt;</span><span class="identifier">a_concrete_class</span><span class="special">*&gt;();</span>
-    <span class="identifier">factories</span><span class="special">[</span><span class="string">"another_name"</span><span class="special">]</span> <span class="special">=</span> 
-        <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">factory</span></code><span class="special">&lt;</span><span class="identifier">another_concrete_class</span><span class="special">*&gt;();</span>
-
-    <span class="comment">// [...]
-</span><span class="special">}</span> 
-</pre>
-<p>
-      Of course we can just as easy create factories that take arguments and/or return
-      <a href="http://www.boost.org/libs/smart_ptr/index.html" target="_top">Smart Pointers</a>.
-    </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_factory.reference"></a><a href="index.html#boost_functional_factory.reference" title=" Reference"> Reference</a></h2></div></div></div>
-<div class="toc"><dl>
-<dt><span class="section"><a href="index.html#boost_functional_factory.reference.value_factory">value_factory</a></span></dt>
-<dt><span class="section"><a href="index.html#boost_functional_factory.reference.factory">factory</a></span></dt>
-</dl></div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functional_factory.reference.value_factory"></a><a href="index.html#boost_functional_factory.reference.value_factory" title="value_factory">value_factory</a></h3></div></div></div>
-<a name="boost_functional_factory.reference.value_factory.description"></a><h4>
-<a name="id936876"></a>
-        <a href="index.html#boost_functional_factory.reference.value_factory.description">Description</a>
-      </h4>
-<p>
-        Function object template that invokes the constructor of the type <code class="computeroutput"><span class="identifier">T</span></code>.
-      </p>
-<a name="boost_functional_factory.reference.value_factory.header"></a><h4>
-<a name="id936914"></a>
-        <a href="index.html#boost_functional_factory.reference.value_factory.header">Header</a>
-      </h4>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">value_factory</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<a name="boost_functional_factory.reference.value_factory.synopsis"></a><h4>
-<a name="id936989"></a>
-        <a href="index.html#boost_functional_factory.reference.value_factory.synopsis">Synopsis</a>
-      </h4>
-<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span>
-<span class="special">{</span>
-    <span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T</span> <span class="special">&gt;</span>
-    <span class="keyword">class</span> <span class="identifier">value_factory</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-<div class="variablelist">
-<p class="title"><b>Notation</b></p>
-<dl>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">T</span></code></span></dt>
-<dd><p>
-            an arbitrary type with at least one public constructor
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code></span></dt>
-<dd><p>
-            argument LValues to a constructor of <code class="computeroutput"><span class="identifier">T</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
-<dd><p>
-            the type <code class="computeroutput"><span class="identifier">value_factory</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
-<dd><p>
-            an instance object of <code class="computeroutput"><span class="identifier">F</span></code>
-          </p></dd>
-</dl>
-</div>
-<a name="boost_functional_factory.reference.value_factory.expression_semantics"></a><h4>
-<a name="id937226"></a>
-        <a href="index.html#boost_functional_factory.reference.value_factory.expression_semantics">Expression
-        Semantics</a>
-      </h4>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Expression
-              </p>
-              </th>
-<th>
-              <p>
-                Semantics
-              </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">F</span><span class="special">()</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                creates an object of type <code class="computeroutput"><span class="identifier">F</span></code>.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">F</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                creates an object of type <code class="computeroutput"><span class="identifier">F</span></code>.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                returns <code class="computeroutput"><span class="identifier">T</span><span class="special">(</span><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></code>.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">F</span><span class="special">::</span><span class="identifier">result_type</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                is the type <code class="computeroutput"><span class="identifier">T</span></code>.
-              </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-<a name="boost_functional_factory.reference.value_factory.limits"></a><h4>
-<a name="id937498"></a>
-        <a href="index.html#boost_functional_factory.reference.value_factory.limits">Limits</a>
-      </h4>
-<p>
-        The macro BOOST_FUNCTIONAL_VALUE_FACTORY_MAX_ARITY can be defined to set
-        the maximum arity. It defaults to 10.
-      </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functional_factory.reference.factory"></a><a href="index.html#boost_functional_factory.reference.factory" title="factory">factory</a></h3></div></div></div>
-<a name="boost_functional_factory.reference.factory.description"></a><h4>
-<a name="id937545"></a>
-        <a href="index.html#boost_functional_factory.reference.factory.description">Description</a>
-      </h4>
-<p>
-        Function object template that dynamically constructs a pointee object for
-        the type of pointer given as template argument. Smart pointers may be used
-        for the template argument, given that <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">pointee</span><span class="special">&lt;</span><span class="identifier">Pointer</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
-        yields the pointee type.
-      </p>
-<p>
-        If an <span class="underline">_allocator</span>_ is given, it is used
-        for memory allocation and the placement form of the <code class="computeroutput"><span class="keyword">new</span></code>
-        operator is used to construct the object. A function object that calls the
-        destructor and deallocates the memory with a copy of the Allocator is used
-        for the second constructor argument of <code class="computeroutput"><span class="identifier">Pointer</span></code>
-        (thus it must be a __smart<span class="underline">pointer</span>_
-        that provides a suitable constructor, such as <a href="http://www.boost.org/libs/smart_ptr/shared_ptr.htm" target="_top"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">shared_ptr</span></code></a>).
-      </p>
-<p>
-        If a third template argument is <code class="computeroutput"><span class="identifier">factory_passes_alloc_to_smart_pointer</span></code>,
-        the allocator itself is used for the third constructor argument of <code class="computeroutput"><span class="identifier">Pointer</span></code> (<a href="http://www.boost.org/libs/smart_ptr/shared_ptr.htm" target="_top"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">shared_ptr</span></code></a> then uses the allocator
-        to manage the memory of its seperately allocated reference counter).
-      </p>
-<a name="boost_functional_factory.reference.factory.header"></a><h4>
-<a name="id937729"></a>
-        <a href="index.html#boost_functional_factory.reference.factory.header">Header</a>
-      </h4>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">factory</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<a name="boost_functional_factory.reference.factory.synopsis"></a><h4>
-<a name="id937804"></a>
-        <a href="index.html#boost_functional_factory.reference.factory.synopsis">Synopsis</a>
-      </h4>
-<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span>
-<span class="special">{</span>
-    <span class="keyword">enum</span> <span class="identifier">factory_alloc_propagation</span>
-    <span class="special">{</span>
-        <span class="identifier">factory_alloc_for_pointee_and_deleter</span><span class="special">,</span>
-        <span class="identifier">factory_passes_alloc_to_smart_pointer</span>
-    <span class="special">};</span>
-
-    <span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">Pointer</span><span class="special">,</span> 
-        <span class="keyword">class</span> <span class="identifier">Allocator</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">none_t</span><span class="special">,</span>
-        <span class="identifier">factory_alloc_propagation</span> <span class="identifier">AllocProp</span> <span class="special">=</span>
-            <span class="identifier">factory_alloc_for_pointee_and_deleter</span> <span class="special">&gt;</span>
-    <span class="keyword">class</span> <span class="identifier">factory</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-<div class="variablelist">
-<p class="title"><b>Notation</b></p>
-<dl>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">T</span></code></span></dt>
-<dd><p>
-            an arbitrary type with at least one public constructor
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">P</span></code></span></dt>
-<dd><p>
-            pointer or smart pointer to <code class="computeroutput"><span class="identifier">T</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code></span></dt>
-<dd><p>
-            argument LValues to a constructor of <code class="computeroutput"><span class="identifier">T</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
-<dd><p>
-            the type <code class="computeroutput"><span class="identifier">factory</span><span class="special">&lt;</span><span class="identifier">P</span><span class="special">&gt;</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
-<dd><p>
-            an instance object of <code class="computeroutput"><span class="identifier">F</span></code>
-          </p></dd>
-</dl>
-</div>
-<a name="boost_functional_factory.reference.factory.expression_semantics"></a><h4>
-<a name="id938169"></a>
-        <a href="index.html#boost_functional_factory.reference.factory.expression_semantics">Expression
-        Semantics</a>
-      </h4>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Expression
-              </p>
-              </th>
-<th>
-              <p>
-                Semantics
-              </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">F</span><span class="special">()</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                creates an object of type <code class="computeroutput"><span class="identifier">F</span></code>.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">F</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                creates an object of type <code class="computeroutput"><span class="identifier">F</span></code>.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                dynamically creates an object of type <code class="computeroutput"><span class="identifier">T</span></code>
-                using <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code> as arguments for the constructor
-                invocation.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">F</span><span class="special">::</span><span class="identifier">result_type</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                is the type <code class="computeroutput"><span class="identifier">P</span></code> with
-                top-level cv-qualifiers removed.
-              </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-<a name="boost_functional_factory.reference.factory.limits"></a><h4>
-<a name="id938440"></a>
-        <a href="index.html#boost_functional_factory.reference.factory.limits">Limits</a>
-      </h4>
-<p>
-        The macro BOOST_FUNCTIONAL_FACTORY_MAX_ARITY can be defined to set the maximum
-        arity. It defaults to 10.
-      </p>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_factory.acknowledgements"></a><a href="index.html#boost_functional_factory.acknowledgements" title="Acknowledgements">Acknowledgements</a></h2></div></div></div>
-<p>
-      Eric Niebler requested a function to invoke a type's constructor (with the
-      arguments supplied as a Tuple) as a Fusion feature. These Factory utilities
-      are a factored-out generalization of this idea.
-    </p>
-<p>
-      Dave Abrahams suggested Smart Pointer support for exception safety, providing
-      useful hints for the implementation.
-    </p>
-<p>
-      Joel de Guzman's documentation style was copied from Fusion.
-    </p>
-<p>
-      Further, I want to thank Peter Dimov for sharing his insights on language details
-      and their evolution.
-    </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_factory.references"></a><a href="index.html#boost_functional_factory.references" title="References">References</a></h2></div></div></div>
-<div class="orderedlist"><ol type="1">
-<li>
-<a href="http://en.wikipedia.org/wiki/Design_Patterns" target="_top">Design Patterns</a>,
-        Gamma et al. - Addison Wesley Publishing, 1995
-      </li>
-<li>
-<a href="http://www.sgi.com/tech/stl/" target="_top">Standard Template Library Programmer's
-        Guide</a>, Hewlett-Packard Company, 1994
-      </li>
-<li>
-<a href="http://www.boost.org/libs/bind/bind.html" target="_top">Boost.Bind</a>,
-        Peter Dimov, 2001-2005
-      </li>
-<li>
-<a href="http://www.boost.org/doc/html/function.html" target="_top">Boost.Function</a>,
-        Douglas Gregor, 2001-2004
-      </li>
-</ol></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: November 01, 2008 at 21:44:52 GMT</small></p></td>
-<td align="right"><div class="copyright-footer"></div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav"></div>
-</body>
+      Distributed under 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) -->
+    <title>Redirect to generated documentation</title>
+    <meta http-equiv="refresh" content="0; URL=http://boost-sandbox.sourceforge.net/libs/functional/factory/doc/html/">
+  </head>
+  <body>
+    Automatic redirection failed, please go to
+    <a href="http://boost-sandbox.sourceforge.net/libs/functional/factory/doc/html/">http://boost-sandbox.sourceforge.net/libs/functional/factory/doc/html/</a>
+  </body>
 </html>
diff --git a/forward/doc/html/boostbook.css b/forward/doc/html/boostbook.css
deleted file mode 100644
index 858d43c..0000000
--- a/forward/doc/html/boostbook.css
+++ /dev/null
@@ -1,528 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2004 Joel de Guzman
-    http://spirit.sourceforge.net/
-
-    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)
-=============================================================================*/
-
-/*=============================================================================
-    Body defaults
-=============================================================================*/
-
-    body
-    {
-        margin: 1em;
-        font-family: sans-serif;
-    }
-
-/*=============================================================================
-    Paragraphs
-=============================================================================*/
-
-    p
-    {
-        text-align: left;
-        font-size: 10pt;
-        line-height: 1.15;
-    }
-
-/*=============================================================================
-    Program listings
-=============================================================================*/
-
-    /* Code on paragraphs */
-    p tt.computeroutput
-    {
-        font-size: 9pt;
-    }
-
-    pre.synopsis
-    {
-        font-size: 90%;
-        margin: 1pc 4% 0pc 4%;
-        padding: 0.5pc 0.5pc 0.5pc 0.5pc;
-    }
-
-    .programlisting,
-    .screen
-    {
-        font-size: 9pt;
-        display: block;
-        margin: 1pc 4% 0pc 4%;
-        padding: 0.5pc 0.5pc 0.5pc 0.5pc;
-    }
-
-    /* Program listings in tables don't get borders */
-    td .programlisting,
-    td .screen
-    {
-        margin: 0pc 0pc 0pc 0pc;
-        padding:  0pc 0pc 0pc 0pc;
-    }
-
-/*=============================================================================
-    Headings
-=============================================================================*/
-
-    h1, h2, h3, h4, h5, h6
-    {
-        text-align: left;
-        margin: 1em 0em 0.5em 0em;
-        font-weight: bold;
-    }
-
-    h1 { font: 140% }
-    h2 { font: bold 140% }
-    h3 { font: bold 130% }
-    h4 { font: bold 120% }
-    h5 { font: italic 110% }
-    h6 { font: italic 100% }
-
-    /* Top page titles */
-    title,
-    h1.title,
-    h2.title
-    h3.title,
-    h4.title,
-    h5.title,
-    h6.title,
-    .refentrytitle
-    {
-        font-weight: bold;
-        margin-bottom: 1pc;
-    }
-
-    h1.title { font-size: 140% }
-    h2.title { font-size: 140% }
-    h3.title { font-size: 130% }
-    h4.title { font-size: 120% }
-    h5.title { font-size: 110% }
-    h6.title { font-size: 100% }
-
-    .section h1
-    {
-        margin: 0em 0em 0.5em 0em;
-        font-size: 140%;
-    }
-
-    .section h2 { font-size: 140% }
-    .section h3 { font-size: 130% }
-    .section h4 { font-size: 120% }
-    .section h5 { font-size: 110% }
-    .section h6 { font-size: 100% }
-
-    /* Code on titles */
-    h1 tt.computeroutput { font-size: 140% }
-    h2 tt.computeroutput { font-size: 140% }
-    h3 tt.computeroutput { font-size: 130% }
-    h4 tt.computeroutput { font-size: 120% }
-    h5 tt.computeroutput { font-size: 110% }
-    h6 tt.computeroutput { font-size: 100% }
-
-/*=============================================================================
-    Author
-=============================================================================*/
-
-    h3.author
-    {
-        font-size: 100%
-    }
-
-/*=============================================================================
-    Lists
-=============================================================================*/
-
-    li
-    {
-        font-size: 10pt;
-        line-height: 1.3;
-    }
-
-    /* Unordered lists */
-    ul
-    {
-        text-align: left;
-    }
-
-    /* Ordered lists */
-    ol
-    {
-        text-align: left;
-    }
-
-/*=============================================================================
-    Links
-=============================================================================*/
-
-    a
-    {
-        text-decoration: none; /* no underline */
-    }
-
-    a:hover
-    {
-        text-decoration: underline;
-    }
-
-/*=============================================================================
-    Spirit style navigation
-=============================================================================*/
-
-    .spirit-nav
-    {
-        text-align: right;
-    }
-
-    .spirit-nav a
-    {
-        color: white;
-        padding-left: 0.5em;
-    }
-
-    .spirit-nav img
-    {
-        border-width: 0px;
-    }
-
-/*=============================================================================
-    Table of contents
-=============================================================================*/
-
-    .toc
-    {
-       margin: 1pc 4% 0pc 4%;
-       padding: 0.1pc 1pc 0.1pc 1pc;
-       font-size: 80%;
-       line-height: 1.15;
-    }
-
-    .boost-toc
-    {
-       float: right;
-       padding: 0.5pc;
-    }
-
-/*=============================================================================
-    Tables
-=============================================================================*/
-
-    .table-title,
-    div.table p.title
-    {
-        margin-left: 4%;
-        padding-right: 0.5em;
-        padding-left: 0.5em;
-    }
-
-    .informaltable table,
-    .table table
-    {
-        width: 92%;
-        margin-left: 4%;
-        margin-right: 4%;
-    }
-
-    div.informaltable table,
-    div.table table
-    {
-        padding: 4px;
-    }
-
-    /* Table Cells */
-    div.informaltable table tr td,
-    div.table table tr td
-    {
-        padding: 0.5em;
-        text-align: left;
-        font-size: 9pt;
-    }
-
-    div.informaltable table tr th,
-    div.table table tr th
-    {
-        padding: 0.5em 0.5em 0.5em 0.5em;
-        border: 1pt solid white;
-        font-size: 80%;
-    }
-
-/*=============================================================================
-    Blurbs
-=============================================================================*/
-
-    div.note,
-    div.tip,
-    div.important,
-    div.caution,
-    div.warning,
-    div.sidebar
-    {
-        font-size: 9pt; /* A little bit smaller than the main text */
-        line-height: 1.2;
-        display: block;
-        margin: 1pc 4% 0pc 4%;
-        padding: 0.5pc 0.5pc 0.0pc 0.5pc;
-    }
-
-    div.sidebar img
-    {
-        padding: 1pt;
-    }
-
-/*=============================================================================
-    Callouts
-=============================================================================*/
-    .line_callout_bug img
-    {
-        float: left;
-        position:relative;
-        left: 4px;
-        top: -12px;
-        clear: left;
-        margin-left:-22px;
-    }
-
-    .callout_bug img
-    {
-    }
-
-/*=============================================================================
-    Variable Lists
-=============================================================================*/
-
-    /* Make the terms in definition lists bold */
-    div.variablelist dl dt,
-    span.term
-    {
-        font-weight: bold;
-        font-size: 10pt;
-    }
-
-    div.variablelist table tbody tr td
-    {
-        text-align: left;
-        vertical-align: top;
-        padding: 0em 2em 0em 0em;
-        font-size: 10pt;
-        margin: 0em 0em 0.5em 0em;
-        line-height: 1;
-    }
-
-    div.variablelist dl dt
-    {
-        margin-bottom: 0.2em;
-    }
-
-    div.variablelist dl dd
-    {
-        margin: 0em 0em 0.5em 2em;
-        font-size: 10pt;
-    }
-
-    div.variablelist table tbody tr td p,
-    div.variablelist dl dd p
-    {
-        margin: 0em 0em 0.5em 0em;
-        line-height: 1;
-    }
-
-/*=============================================================================
-    Misc
-=============================================================================*/
-
-    /* Title of books and articles in bibliographies */
-    span.title
-    {
-        font-style: italic;
-    }
-
-    span.underline
-    {
-        text-decoration: underline;
-    }
-
-    span.strikethrough
-    {
-        text-decoration: line-through;
-    }
-
-    /* Copyright, Legal Notice */
-    div div.legalnotice p
-    {
-        text-align: left
-    }
-
-/*=============================================================================
-    Colors
-=============================================================================*/
-
-    @media screen
-    {
-    /* Links */
-        a
-        {
-            color: #005a9c;
-        }
-
-        a:visited
-        {
-            color: #9c5a9c;
-        }
-
-        h1 a, h2 a, h3 a, h4 a, h5 a, h6 a,
-        h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover,
-        h1 a:visited, h2 a:visited, h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited
-        {
-            text-decoration: none; /* no underline */
-            color: #000000;
-        }
-
-    /* Syntax Highlighting */
-        .keyword        { color: #0000AA; }
-        .identifier     { color: #000000; }
-        .special        { color: #707070; }
-        .preprocessor   { color: #402080; }
-        .char           { color: teal; }
-        .comment        { color: #800000; }
-        .string         { color: teal; }
-        .number         { color: teal; }
-        .white_bkd      { background-color: #FFFFFF; }
-        .dk_grey_bkd    { background-color: #999999; }
-
-    /* Copyright, Legal Notice */
-        .copyright
-        {
-            color: #666666;
-            font-size: small;
-        }
-
-        div div.legalnotice p
-        {
-            color: #666666;
-        }
-
-    /* Program listing */
-        pre.synopsis
-        {
-            border: 1px solid #DCDCDC;
-        }
-
-        .programlisting,
-        .screen
-        {
-            border: 1px solid #DCDCDC;
-        }
-
-        td .programlisting,
-        td .screen
-        {
-            border: 0px solid #DCDCDC;
-        }
-
-    /* Blurbs */
-        div.note,
-        div.tip,
-        div.important,
-        div.caution,
-        div.warning,
-        div.sidebar
-        {
-            border: 1px solid #DCDCDC;
-        }
-
-    /* Table of contents */
-        .toc
-        {
-            border: 1px solid #DCDCDC;
-        }
-
-    /* Tables */
-        div.informaltable table tr td,
-        div.table table tr td
-        {
-            border: 1px solid #DCDCDC;
-        }
-
-        div.informaltable table tr th,
-        div.table table tr th
-        {
-            background-color: #F0F0F0;
-            border: 1px solid #DCDCDC;
-        }
-
-    /* Misc */
-        span.highlight
-        {
-            color: #00A000;
-        }
-    }
-
-    @media print
-    {
-    /* Links */
-        a
-        {
-            color: black;
-        }
-
-        a:visited
-        {
-            color: black;
-        }
-
-        .spirit-nav
-        {
-            display: none;
-        }
-
-    /* Program listing */
-        pre.synopsis
-        {
-            border: 1px solid gray;
-        }
-
-        .programlisting,
-        .screen
-        {
-            border: 1px solid gray;
-        }
-
-        td .programlisting,
-        td .screen
-        {
-            border: 0px solid #DCDCDC;
-        }
-
-    /* Table of contents */
-        .toc
-        {
-            border: 1px solid gray;
-        }
-
-        .informaltable table,
-        .table table
-        {
-            border: 1px solid gray;
-            border-collapse: collapse;
-        }
-
-    /* Tables */
-        div.informaltable table tr td,
-        div.table table tr td
-        {
-            border: 1px solid gray;
-        }
-
-        div.informaltable table tr th,
-        div.table table tr th
-        {
-            border: 1px solid gray;
-        }
-
-    /* Misc */
-        span.highlight
-        {
-            font-weight: bold;
-        }
-    }
diff --git a/forward/doc/html/index.html b/forward/doc/html/index.html
index e82fe81..0e7fad9 100644
--- a/forward/doc/html/index.html
+++ b/forward/doc/html/index.html
@@ -1,564 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Chapter 1. Boost.Functional/Forward 1.0</title>
-<link rel="stylesheet" href="boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="Chapter 1. Boost.Functional/Forward 1.0">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav"></div>
-<div class="chapter" lang="en">
-<div class="titlepage"><div>
-<div><h2 class="title">
-<a name="boost_functional_forward"></a>Chapter 1. Boost.Functional/Forward 1.0</h2></div>
-<div><div class="author"><h3 class="author">
-<span class="firstname">Tobias</span> <span class="surname">Schwinger</span>
-</h3></div></div>
-<div><p class="copyright">Copyright © 2007, 2008 Tobias Schwinger</p></div>
-<div><div class="legalnotice">
-<a name="id934161"></a><p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></div>
-</div></div>
-<div class="toc">
-<p><b>Table of Contents</b></p>
-<dl>
-<dt><span class="section"><a href="index.html#boost_functional_forward.brief_description">Brief Description</a></span></dt>
-<dt><span class="section"><a href="index.html#boost_functional_forward.background">Background</a></span></dt>
-<dt><span class="section"><a href="index.html#boost_functional_forward.reference"> Reference</a></span></dt>
-<dt><span class="section"><a href="index.html#boost_functional_forward.acknowledgements">Acknowledgements</a></span></dt>
-<dt><span class="section"><a href="index.html#boost_functional_forward.references">References</a></span></dt>
-</dl>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_forward.brief_description"></a><a href="index.html#boost_functional_forward.brief_description" title="Brief Description">Brief Description</a></h2></div></div></div>
-<p>
-      <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">forward_adapter</span></code> provides a reusable adapter
-      template for function objects. It forwards RValues as references to const,
-      while leaving LValues as-is.
-    </p>
-<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">g</span> <span class="comment">// function object that only accept LValues
-</span><span class="special">{</span>
-    <span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span> <span class="special">&gt;</span>
-    <span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">T0</span> <span class="special">&amp;</span> <span class="identifier">t0</span><span class="special">,</span> <span class="identifier">T1</span> <span class="special">&amp;</span> <span class="identifier">t1</span><span class="special">,</span> <span class="identifier">T2</span> <span class="special">&amp;</span> <span class="identifier">t2</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <head>
+  <!-- Copyright (C) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
 
-    <span class="keyword">typedef</span> <span class="keyword">void</span> <span class="identifier">result_type</span><span class="special">;</span>
-<span class="special">};</span>
-
-<span class="comment">// Adapted version also accepts RValues and forwards
-</span><span class="comment">// them as references to const, LValues as-is
-</span><span class="keyword">typedef</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">forward_adapter</span><span class="special">&lt;</span><span class="identifier">g</span><span class="special">&gt;</span> <span class="identifier">f</span><span class="special">;</span>
-</pre>
-<p>
-      Another adapter, <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">lighweight_forward_adapter</span></code> allows forwarding
-      with some help from the user accepting and unwrapping reference wrappers (see
-      <a href="http://www.boost.org/doc/html/ref.html" target="_top">Boost.Ref</a>) for
-      reference arguments, const qualifying all other arguments.
-    </p>
-<p>
-      The target functions must be compatible with <a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top">Boost.ResultOf</a>,
-      and so are the adapters.
-    </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_forward.background"></a><a href="index.html#boost_functional_forward.background" title="Background">Background</a></h2></div></div></div>
-<p>
-      Let's suppose we have some function <code class="computeroutput"><span class="identifier">f</span></code>
-      that we can call like this:
-    </p>
-<pre class="programlisting"><span class="identifier">f</span><span class="special">(</span><span class="number">123</span><span class="special">,</span><span class="identifier">a_variable</span><span class="special">);</span>
-</pre>
-<p>
-      Now we want to write another, generic function <code class="computeroutput"><span class="identifier">g</span></code>
-      that can be called the same way and returns some object that calls <code class="computeroutput"><span class="identifier">f</span></code> with the same arguments.
-    </p>
-<pre class="programlisting"><span class="identifier">f</span><span class="special">(</span><span class="number">123</span><span class="special">,</span><span class="identifier">a_variable</span><span class="special">)</span> <span class="special">==</span> <span class="identifier">g</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span><span class="number">123</span><span class="special">,</span><span class="identifier">a_variable</span><span class="special">).</span><span class="identifier">call_f</span><span class="special">()</span>
-</pre>
-<a name="boost_functional_forward.background.why_would_we_want_to_do_it__anyway_"></a><h3>
-<a name="id934701"></a>
-      <a href="index.html#boost_functional_forward.background.why_would_we_want_to_do_it__anyway_">Why
-      would we want to do it, anyway?</a>
-    </h3>
-<p>
-      Maybe we want to run <code class="computeroutput"><span class="identifier">f</span></code> several
-      times. Or maybe we want to run it within another thread. Maybe we just want
-      to encapsulate the call expression for now, and then use it with other code
-      that allows to compose more complex expressions in order to decompose it with
-      C++ templates and have the compiler generate some machinery that eventually
-      calls <code class="computeroutput"><span class="identifier">f</span></code> at runtime (in other
-      words; apply a technique that is commonly referred to as Expression Templates).
-    </p>
-<a name="boost_functional_forward.background.now__how_do_we_do_it_"></a><h3>
-<a name="id934755"></a>
-      <a href="index.html#boost_functional_forward.background.now__how_do_we_do_it_">Now,
-      how do we do it?</a>
-    </h3>
-<p>
-      The bad news is: It's impossible.
-    </p>
-<p>
-      That is so because there is a slight difference between a variable and an expression
-      that evaluates to its value: Given
-    </p>
-<pre class="programlisting"><span class="keyword">int</span> <span class="identifier">y</span><span class="special">;</span>
-<span class="keyword">int</span> <span class="keyword">const</span> <span class="identifier">z</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-</pre>
-<p>
-      and
-    </p>
-<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T</span> <span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">func1</span><span class="special">(</span><span class="identifier">T</span> <span class="special">&amp;</span> <span class="identifier">x</span><span class="special">);</span>
-</pre>
-<p>
-      we can call
-    </p>
-<pre class="programlisting"><span class="identifier">func1</span><span class="special">(</span><span class="identifier">y</span><span class="special">);</span> <span class="comment">// x is a reference to a non-const object
-</span><span class="identifier">func1</span><span class="special">(</span><span class="identifier">z</span><span class="special">);</span> <span class="comment">// x is a reference to a const object
-</span></pre>
-<p>
-      where
-    </p>
-<pre class="programlisting"><span class="identifier">func1</span><span class="special">(</span><span class="number">1</span><span class="special">);</span> <span class="comment">// fails to compile.
-</span></pre>
-<p>
-      This way we can safely have <code class="computeroutput"><span class="identifier">func1</span></code>
-      store its reference argument and the compiler keeps us from storing a reference
-      to an object with temporary lifetime.
-    </p>
-<p>
-      It is important to realize that non-constness and whether an object binds to
-      a non-const reference parameter are two different properties. The latter is
-      the distinction between LValues and RValues. The names stem from the left hand
-      side and the right hand side of assignment expressions, thus LValues are typically
-      the ones you can assign to, and RValues the temporary results from the right
-      hand side expression.
-    </p>
-<pre class="programlisting"><span class="identifier">y</span> <span class="special">=</span> <span class="number">1</span><span class="special">+</span><span class="number">2</span><span class="special">;</span>        <span class="comment">// a is LValue, 1+2 is the expression producing the RValue,
-</span><span class="comment">// 1+2 = a;     // usually makes no sense. 
-</span>
-<span class="identifier">func1</span><span class="special">(</span><span class="identifier">y</span><span class="special">);</span>       <span class="comment">// works, because y is an LValue
-</span><span class="comment">// func1(1+2);  // fails to compile, because we only got an RValue.
-</span></pre>
-<p>
-      If we add const qualification on the parameter, our function also accepts RValues:
-    </p>
-<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T</span> <span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">func2</span><span class="special">(</span><span class="identifier">T</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">x</span><span class="special">);</span>
-
-<span class="comment">// [...] function scope:
-</span><span class="identifier">func2</span><span class="special">(</span><span class="number">1</span><span class="special">);</span> <span class="comment">// x is a reference to a const temporary, object,
-</span><span class="identifier">func2</span><span class="special">(</span><span class="identifier">y</span><span class="special">);</span> <span class="comment">// x is a reference to a const object, while y is not const, and
-</span><span class="identifier">func2</span><span class="special">(</span><span class="identifier">z</span><span class="special">);</span> <span class="comment">// x is a reference to a const object, just like z.
-</span></pre>
-<p>
-      In all cases, the argument <code class="computeroutput"><span class="identifier">x</span></code>
-      in <code class="computeroutput"><span class="identifier">func2</span></code> is a const-qualified
-      LValue. We can use function overloading to identify non-const LValues:
-    </p>
-<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T</span> <span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">func3</span><span class="special">(</span><span class="identifier">T</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">x</span><span class="special">);</span> <span class="comment">// #1
-</span><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">typename</span> <span class="identifier">T</span> <span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">func3</span><span class="special">(</span><span class="identifier">T</span> <span class="special">&amp;</span> <span class="identifier">x</span><span class="special">);</span>       <span class="comment">// #2
-</span>
-<span class="comment">// [...] function scope:
-</span><span class="identifier">func3</span><span class="special">(</span><span class="number">1</span><span class="special">);</span> <span class="comment">// x is a reference to a const, temporary object in #1,
-</span><span class="identifier">func3</span><span class="special">(</span><span class="identifier">y</span><span class="special">);</span> <span class="comment">// x is a reference to a non-const object in #2, and
-</span><span class="identifier">func3</span><span class="special">(</span><span class="identifier">z</span><span class="special">);</span> <span class="comment">// x is a reference to a const object in #1.
-</span></pre>
-<p>
-      Note that all arguments <code class="computeroutput"><span class="identifier">x</span></code> in
-      the overloaded function <code class="computeroutput"><span class="identifier">func3</span></code>
-      are LValues. In fact, there is no way to transport RValues into a function
-      as-is in C++98. Also note that we can't distinguish between what used to be
-      a const qualified LValue and an RValue.
-    </p>
-<p>
-      That's as close as we can get to a generic forwarding function <code class="computeroutput"><span class="identifier">g</span></code> as described above by the means of C++
-      98. See <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm" target="_top">The
-      Forwarding Problem</a> for a very detailed discussion including solutions
-      that require language changes.
-    </p>
-<p>
-      Now, for actually implementing it, we need 2^N overloads for N parameters (each
-      with and without const qualifier) for each number of arguments (that is 2^(Nmax+1)
-      - 2^Nmin). Right, that means the compile-time complexity is O(2^N), however
-      the factor is low so it works quite well for a reasonable number (&lt; 10)
-      of arguments.
-    </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_forward.reference"></a><a href="index.html#boost_functional_forward.reference" title=" Reference"> Reference</a></h2></div></div></div>
-<div class="toc"><dl>
-<dt><span class="section"><a href="index.html#boost_functional_forward.reference.forward_adapter">forward_adapter</a></span></dt>
-<dt><span class="section"><a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter">lightweight_forward_adapter</a></span></dt>
-</dl></div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functional_forward.reference.forward_adapter"></a><a href="index.html#boost_functional_forward.reference.forward_adapter" title="forward_adapter">forward_adapter</a></h3></div></div></div>
-<a name="boost_functional_forward.reference.forward_adapter.description"></a><h4>
-<a name="id935594"></a>
-        <a href="index.html#boost_functional_forward.reference.forward_adapter.description">Description</a>
-      </h4>
-<p>
-        Function object adapter template whose instances are callable with LValue
-        and RValue arguments. RValue arguments are forwarded as reference-to-const
-        typed LValues.
-      </p>
-<p>
-        An arity can be given as second, numeric non-type template argument to restrict
-        forwarding to a specific arity. If a third, numeric non-type template argument
-        is present, the second and third template argument are treated as minimum
-        and maximum arity, respectively. Specifying an arity can be helpful to improve
-        the readability of diagnostic messages and compile time performance.
-      </p>
-<p>
-        <a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top">Boost.ResultOf</a>
-        can be used to determine the result types of specific call expressions.
-      </p>
-<a name="boost_functional_forward.reference.forward_adapter.header"></a><h4>
-<a name="id935646"></a>
-        <a href="index.html#boost_functional_forward.reference.forward_adapter.header">Header</a>
-      </h4>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">forward_adapter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<a name="boost_functional_forward.reference.forward_adapter.synopsis"></a><h4>
-<a name="id935721"></a>
-        <a href="index.html#boost_functional_forward.reference.forward_adapter.synopsis">Synopsis</a>
-      </h4>
-<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span>
-<span class="special">{</span>
-    <span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">class</span> <span class="identifier">Function</span><span class="special">,</span>
-        <span class="keyword">int</span> <span class="identifier">Arity_Or_MinArity</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">MaxArity</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span> <span class="special">&gt;</span>
-    <span class="keyword">class</span> <span class="identifier">forward_adapter</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-<div class="variablelist">
-<p class="title"><b>Notation</b></p>
-<dl>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
-<dd><p>
-            a possibly const qualified function object type or reference type thereof
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
-<dd><p>
-            an object convertible to <code class="computeroutput"><span class="identifier">F</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">FA</span></code></span></dt>
-<dd><p>
-            the type <code class="computeroutput"><span class="identifier">forward_adapter</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">fa</span></code></span></dt>
-<dd><p>
-            an instance object of <code class="computeroutput"><span class="identifier">FA</span></code>,
-            initialized with <code class="computeroutput"><span class="identifier">f</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code></span></dt>
-<dd><p>
-            arguments to <code class="computeroutput"><span class="identifier">fa</span></code>
-          </p></dd>
-</dl>
-</div>
-<p>
-        The result type of a target function invocation must be
-      </p>
-<pre class="programlisting"><a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">result_of</span></code></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">*(</span><span class="identifier">TA0</span> <span class="special">[</span><span class="keyword">const</span><span class="special">]&amp;...</span><span class="identifier">TAN</span> <span class="special">[</span><span class="keyword">const</span><span class="special">]&amp;])&gt;::</span><span class="identifier">type</span>
-</pre>
-<p>
-        where <code class="computeroutput"><span class="identifier">TA0</span></code>...<code class="computeroutput"><span class="identifier">TAN</span></code> denote the argument types of <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code>.
-      </p>
-<a name="boost_functional_forward.reference.forward_adapter.expression_semantics"></a><h4>
-<a name="id936177"></a>
-        <a href="index.html#boost_functional_forward.reference.forward_adapter.expression_semantics">Expression
-        Semantics</a>
-      </h4>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Expression
-              </p>
-              </th>
-<th>
-              <p>
-                Semantics
-              </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">FA</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                creates an adapter, initializes the target function with <code class="computeroutput"><span class="identifier">f</span></code>.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">FA</span><span class="special">()</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                creates an adapter, attempts to use <code class="computeroutput"><span class="identifier">F</span></code>'s
-                default constructor.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">fa</span><span class="special">(</span><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                calls <code class="computeroutput"><span class="identifier">f</span></code> with with
-                arguments <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code>.
-              </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-<a name="boost_functional_forward.reference.forward_adapter.limits"></a><h4>
-<a name="id936405"></a>
-        <a href="index.html#boost_functional_forward.reference.forward_adapter.limits">Limits</a>
-      </h4>
-<p>
-        The macro BOOST_FUNCTIONAL_FORWARD_ADAPTER_MAX_ARITY can be defined to set
-        the maximum call arity. It defaults to 6.
-      </p>
-<a name="boost_functional_forward.reference.forward_adapter.complexity"></a><h4>
-<a name="id936434"></a>
-        <a href="index.html#boost_functional_forward.reference.forward_adapter.complexity">Complexity</a>
-      </h4>
-<p>
-        Preprocessing time: O(2^N), where N is the arity limit. Compile time: O(2^N),
-        where N depends on the arity range. Run time: O(0) if the compiler inlines,
-        O(1) otherwise.
-      </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functional_forward.reference.lightweight_forward_adapter"></a><a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter" title="lightweight_forward_adapter">lightweight_forward_adapter</a></h3></div></div></div>
-<a name="boost_functional_forward.reference.lightweight_forward_adapter.description"></a><h4>
-<a name="id936485"></a>
-        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.description">Description</a>
-      </h4>
-<p>
-        Function object adapter template whose instances are callable with LValue
-        and RValue arguments. All arguments are forwarded as reference-to-const typed
-        LValues, except for reference wrappers which are unwrapped and may yield
-        non-const LValues.
-      </p>
-<p>
-        An arity can be given as second, numeric non-type template argument to restrict
-        forwarding to a specific arity. If a third, numeric non-type template argument
-        is present, the second and third template argument are treated as minimum
-        and maximum arity, respectively. Specifying an arity can be helpful to improve
-        the readability of diagnostic messages and compile time performance.
-      </p>
-<p>
-        <a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top">Boost.ResultOf</a>
-        can be used to determine the result types of specific call expressions.
-      </p>
-<a name="boost_functional_forward.reference.lightweight_forward_adapter.header"></a><h4>
-<a name="id936540"></a>
-        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.header">Header</a>
-      </h4>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">lightweight_forward_adapter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<a name="boost_functional_forward.reference.lightweight_forward_adapter.synopsis"></a><h4>
-<a name="id936616"></a>
-        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.synopsis">Synopsis</a>
-      </h4>
-<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span>
-<span class="special">{</span>
-    <span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">class</span> <span class="identifier">Function</span><span class="special">,</span>
-        <span class="keyword">int</span> <span class="identifier">Arity_Or_MinArity</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">MaxArity</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span> <span class="special">&gt;</span>
-    <span class="keyword">struct</span> <span class="identifier">lightweight_forward_adapter</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-<div class="variablelist">
-<p class="title"><b>Notation</b></p>
-<dl>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
-<dd><p>
-            a possibly const qualified function object type or reference type thereof
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
-<dd><p>
-            an object convertible to <code class="computeroutput"><span class="identifier">F</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">FA</span></code></span></dt>
-<dd><p>
-            the type <code class="computeroutput"><span class="identifier">lightweight_forward_adapter</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">fa</span></code></span></dt>
-<dd><p>
-            an instance of <code class="computeroutput"><span class="identifier">FA</span></code>, initialized
-            with <code class="computeroutput"><span class="identifier">f</span></code>
-          </p></dd>
-<dt><span class="term"><code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code></span></dt>
-<dd><p>
-            arguments to <code class="computeroutput"><span class="identifier">fa</span></code>
-          </p></dd>
-</dl>
-</div>
-<p>
-        The result type of a target function invocation must be
-      </p>
-<pre class="programlisting"><a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">result_of</span></code></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">*(</span><span class="identifier">TA0</span> <span class="special">[</span><span class="keyword">const</span><span class="special">]&amp;...</span><span class="identifier">TAN</span> <span class="special">[</span><span class="keyword">const</span><span class="special">]&amp;])&gt;::</span><span class="identifier">type</span>
-</pre>
-<p>
-        where <code class="computeroutput"><span class="identifier">TA0</span></code>...<code class="computeroutput"><span class="identifier">TAN</span></code> denote the argument types of <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code>.
-      </p>
-<a name="boost_functional_forward.reference.lightweight_forward_adapter.expression_semantics"></a><h4>
-<a name="id937073"></a>
-        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.expression_semantics">Expression
-        Semantics</a>
-      </h4>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Expression
-              </p>
-              </th>
-<th>
-              <p>
-                Semantics
-              </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">FA</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                creates an adapter, initializes the target function with <code class="computeroutput"><span class="identifier">f</span></code>.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">FA</span><span class="special">()</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                creates an adapter, attempts to use <code class="computeroutput"><span class="identifier">F</span></code>'s
-                default constructor.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="computeroutput"><span class="identifier">fa</span><span class="special">(</span><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></code>
-              </p>
-              </td>
-<td>
-              <p>
-                calls <code class="computeroutput"><span class="identifier">f</span></code> with with
-                const arguments <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code>. If <code class="computeroutput"><span class="identifier">aI</span></code>
-                is a reference wrapper it is unwrapped.
-              </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-<a name="boost_functional_forward.reference.lightweight_forward_adapter.limits"></a><h4>
-<a name="id937311"></a>
-        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.limits">Limits</a>
-      </h4>
-<p>
-        The macro BOOST_FUNCTIONAL_LIGHTWEIGHT_FORWARD_ADAPTER_MAX_ARITY can be defined
-        to set the maximum call arity. It defaults to 10.
-      </p>
-<a name="boost_functional_forward.reference.lightweight_forward_adapter.complexity"></a><h4>
-<a name="id937342"></a>
-        <a href="index.html#boost_functional_forward.reference.lightweight_forward_adapter.complexity">Complexity</a>
-      </h4>
-<p>
-        Preprocessing time: O(N), where N is the arity limit. Compile time: O(N),
-        where N is the effective arity of a call. Run time: O(0) if the compiler
-        inlines, O(1) otherwise.
-      </p>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_forward.acknowledgements"></a><a href="index.html#boost_functional_forward.acknowledgements" title="Acknowledgements">Acknowledgements</a></h2></div></div></div>
-<p>
-      As these utilities are factored out of the <a href="http://www.boost.org/libs/fusion/doc/html/index.html" target="_top">Boost.Fusion</a>
-      functional module, I want to thank Dan Marsden and Joel de Guzman for letting
-      me participate in the development of that great library in the first place.
-    </p>
-<p>
-      Further, I want to credit the authors of the references below, for their in-depth
-      investigation of the problem and the solution implemented here.
-    </p>
-<p>
-      Last but not least I want to thank Vesa Karnoven and Paul Mensonides for the
-      Boost Preprocessor library. Without it, I would have ended up with an external
-      code generator for this one.
-    </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_forward.references"></a><a href="index.html#boost_functional_forward.references" title="References">References</a></h2></div></div></div>
-<div class="orderedlist"><ol type="1">
-<li>
-<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm" target="_top">The
-        Forwarding Problem</a>, Peter Dimov, Howard E. Hinnant, David Abrahams,
-        2002
-      </li>
-<li>
-<a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top">Boost.ResultOf</a>,
-        Douglas Gregor, 2004
-      </li>
-<li>
-<a href="http://www.boost.org/doc/html/ref.html" target="_top">Boost.Ref</a>, Jaakko
-        Jarvi, Peter Dimov, Douglas Gregor, David Abrahams, 1999-2002
-      </li>
-</ol></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: November 01, 2008 at 19:58:50 GMT</small></p></td>
-<td align="right"><div class="copyright-footer"></div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav"></div>
-</body>
+      Distributed under 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) -->
+    <title>Redirect to generated documentation</title>
+    <meta http-equiv="refresh" content="0; URL=http://boost-sandbox.sourceforge.net/libs/functional/forward/doc/html/">
+  </head>
+  <body>
+    Automatic redirection failed, please go to
+    <a href="http://boost-sandbox.sourceforge.net/libs/functional/forward/doc/html/">http://boost-sandbox.sourceforge.net/libs/functional/forward/doc/html/</a>
+  </body>
 </html>
diff --git a/overloaded_function/doc/html/BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html b/overloaded_function/doc/html/BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html
index b59ac5a..4baf1a8 100644
--- a/overloaded_function/doc/html/BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html
+++ b/overloaded_function/doc/html/BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html
@@ -33,9 +33,9 @@
 
 </span>BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX</pre></div>
 <div class="refsect1">
-<a name="id813516"></a><h2>Description</h2>
+<a name="id821556"></a><h2>Description</h2>
 <p>If this macro is left undefined by the user, it has a default value of 5 (increasing this number might increase compilation time). When specified by the user, this macro must be a non-negative integer number.</p>
-<p><span class="bold"><strong>See:</strong></span>  <a class="link" href="boost_functional_overloadedfunction/Getting_Started.html" title="Getting Started"> Getting Started</a>,  <code class="computeroutput"><a class="link" href="boost/overloaded_function.html" title="Class template overloaded_function">boost::overloaded_function</a></code>. </p>
+<p><span class="bold"><strong>See:</strong></span>  <a class="link" href="boost_functional_overloadedfunction/getting_started.html" title="Getting Started"> Getting Started</a>,  <code class="computeroutput"><a class="link" href="boost/overloaded_function.html" title="Class template overloaded_function">boost::overloaded_function</a></code>. </p>
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
diff --git a/overloaded_function/doc/html/BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html b/overloaded_function/doc/html/BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html
index 9db47e1..3ebb559 100644
--- a/overloaded_function/doc/html/BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html
+++ b/overloaded_function/doc/html/BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Chapter&#160;1.&#160;Boost.Functional/OverloadedFunction 1.0.0">
 <link rel="up" href="reference.html#header.boost.functional.overloaded_function.config_hpp" title="Header &lt;boost/functional/overloaded_function/config.hpp&gt;">
 <link rel="prev" href="BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html" title="Macro BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX">
-<link rel="next" href="boost_functional_overloadedfunction/Acknowledgments.html" title="Acknowledgments">
+<link rel="next" href="boost_functional_overloadedfunction/acknowledgments.html" title="Acknowledgments">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.functional.overloaded_function.config_hpp"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="boost_functional_overloadedfunction/Acknowledgments.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.functional.overloaded_function.config_hpp"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="boost_functional_overloadedfunction/acknowledgments.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX"></a><div class="titlepage"></div>
@@ -33,9 +33,9 @@
 
 </span>BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX</pre></div>
 <div class="refsect1">
-<a name="id813573"></a><h2>Description</h2>
+<a name="id821614"></a><h2>Description</h2>
 <p>If this macro is left undefined by the user, it has a default value of 5 (increasing this number might increase compilation time). When defined by the user, this macro must be an integer number greater or equal than 2 (because at least two distinct functions need to be specified in order to define an overload).</p>
-<p><span class="bold"><strong>See:</strong></span>  <a class="link" href="boost_functional_overloadedfunction/Getting_Started.html" title="Getting Started"> Getting Started</a>,  <code class="computeroutput"><a class="link" href="boost/overloaded_function.html" title="Class template overloaded_function">boost::overloaded_function</a></code>. </p>
+<p><span class="bold"><strong>See:</strong></span>  <a class="link" href="boost_functional_overloadedfunction/getting_started.html" title="Getting Started"> Getting Started</a>,  <code class="computeroutput"><a class="link" href="boost/overloaded_function.html" title="Class template overloaded_function">boost::overloaded_function</a></code>. </p>
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
@@ -48,7 +48,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.functional.overloaded_function.config_hpp"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="boost_functional_overloadedfunction/Acknowledgments.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.functional.overloaded_function.config_hpp"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="boost_functional_overloadedfunction/acknowledgments.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/overloaded_function/doc/html/boost/make_overloaded_function.html b/overloaded_function/doc/html/boost/make_overloaded_function.html
index 998264b..21f5f39 100644
--- a/overloaded_function/doc/html/boost/make_overloaded_function.html
+++ b/overloaded_function/doc/html/boost/make_overloaded_function.html
@@ -36,12 +36,12 @@
   <a class="link" href="overloaded_function.html" title="Class template overloaded_function">overloaded_function</a><span class="special">&lt;</span> <span class="identifier">__function_type__</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span><span class="special">,</span> <span class="identifier">__function_type__</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span><span class="special">,</span><span class="special">...</span><span class="special">&gt;</span> 
   <span class="identifier">make_overloaded_function</span><span class="special">(</span><span class="identifier">F1</span> f1<span class="special">,</span> <span class="identifier">F2</span> f2<span class="special">,</span> <span class="special">...</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="id813336"></a><h2>Description</h2>
+<a name="id821376"></a><h2>Description</h2>
 <p>This function template creates and returns an  <code class="computeroutput"><code class="computeroutput"><a class="link" href="overloaded_function.html" title="Class template overloaded_function">overloaded_function</a></code></code> object that overloads all the specified functions <code class="computeroutput">f1</code>, <code class="computeroutput">f2</code>, etc.</p>
-<p>The function types are internally determined from the template parameter types so they do not need to be explicitly specified. Therefore, this function template usually has a more concise syntax when compared with  <code class="computeroutput"><code class="computeroutput"><a class="link" href="overloaded_function.html" title="Class template overloaded_function">overloaded_function</a></code></code>. This is especially useful when the explicit type of the returned  <code class="computeroutput"><code class="computeroutput"><a class="link" href="overloaded_function.html" title="Class template overloaded_function">overloaded_function</a></code></code> object does not need to be known (e.g., when used with Boost.Typeof's <code class="computeroutput">BOOST_AUTO</code>, C++11 <code class="computeroutput">auto</code>, or when the overloaded function object is handled using a function template parameter, see the  <a class="link" href="../boost_functional_overloadedfunction/Tutorial.html" title="Tutorial">Tutorial</a> section).</p>
+<p>The function types are internally determined from the template parameter types so they do not need to be explicitly specified. Therefore, this function template usually has a more concise syntax when compared with  <code class="computeroutput"><code class="computeroutput"><a class="link" href="overloaded_function.html" title="Class template overloaded_function">overloaded_function</a></code></code>. This is especially useful when the explicit type of the returned  <code class="computeroutput"><code class="computeroutput"><a class="link" href="overloaded_function.html" title="Class template overloaded_function">overloaded_function</a></code></code> object does not need to be known (e.g., when used with Boost.Typeof's <code class="computeroutput">BOOST_AUTO</code>, C++11 <code class="computeroutput">auto</code>, or when the overloaded function object is handled using a function template parameter, see the  <a class="link" href="../boost_functional_overloadedfunction/tutorial.html" title="Tutorial"> Tutorial</a> section).</p>
 <p>The maximum number of functions to overload is given by the  <code class="computeroutput"><code class="computeroutput"><a class="link" href="../BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html" title="Macro BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX">BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX</a></code></code> configuration macro.</p>
 <p><span class="bold"><strong>Note:</strong></span> In this documentation, <code class="computeroutput">__function_type__</code> is a placeholder for a symbol that is specific to the implementation of this library.</p>
-<p><span class="bold"><strong>See:</strong></span>  <a class="link" href="../boost_functional_overloadedfunction/Tutorial.html" title="Tutorial">Tutorial</a> section,  <code class="computeroutput"><code class="computeroutput"><a class="link" href="overloaded_function.html" title="Class template overloaded_function">overloaded_function</a></code></code>,  <code class="computeroutput"><code class="computeroutput"><a class="link" href="../BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html" title="Macro BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX">BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX</a></code></code>. </p>
+<p><span class="bold"><strong>See:</strong></span>  <a class="link" href="../boost_functional_overloadedfunction/tutorial.html" title="Tutorial"> Tutorial</a> section,  <code class="computeroutput"><code class="computeroutput"><a class="link" href="overloaded_function.html" title="Class template overloaded_function">overloaded_function</a></code></code>,  <code class="computeroutput"><code class="computeroutput"><a class="link" href="../BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html" title="Macro BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX">BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX</a></code></code>. </p>
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
diff --git a/overloaded_function/doc/html/boost/overloaded_function.html b/overloaded_function/doc/html/boost/overloaded_function.html
index 7421832..c8c600f 100644
--- a/overloaded_function/doc/html/boost/overloaded_function.html
+++ b/overloaded_function/doc/html/boost/overloaded_function.html
@@ -35,19 +35,19 @@
 <span class="keyword">class</span> <a class="link" href="overloaded_function.html" title="Class template overloaded_function">overloaded_function</a> <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
   <span class="comment">// <a class="link" href="overloaded_function.html#boost.overloaded_functionconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="overloaded_function.html#id313151-bb"><span class="identifier">overloaded_function</span></a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span> <span class="special">&amp;</span><span class="special">,</span> 
+  <a class="link" href="overloaded_function.html#id259090-bb"><span class="identifier">overloaded_function</span></a><span class="special">(</span><span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span> <span class="special">&amp;</span><span class="special">,</span> 
                       <span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span> <span class="special">&amp;</span><span class="special">,</span> <span class="special">...</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="overloaded_function.html#id313082-bb">public member functions</a></span>
+  <span class="comment">// <a class="link" href="overloaded_function.html#id259020-bb">public member functions</a></span>
   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">result_type</span> 
-  <a class="link" href="overloaded_function.html#id313084-bb"><span class="keyword">operator</span><span class="special">(</span><span class="special">)</span></a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg1_type</span><span class="special">,</span> 
+  <a class="link" href="overloaded_function.html#id259023-bb"><span class="keyword">operator</span><span class="special">(</span><span class="special">)</span></a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg1_type</span><span class="special">,</span> 
              <span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg2_type</span><span class="special">,</span> <span class="special">...</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
   <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">result_type</span> 
-  <a class="link" href="overloaded_function.html#id313110-bb"><span class="keyword">operator</span><span class="special">(</span><span class="special">)</span></a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg1_type</span><span class="special">,</span> 
+  <a class="link" href="overloaded_function.html#id259049-bb"><span class="keyword">operator</span><span class="special">(</span><span class="special">)</span></a><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg1_type</span><span class="special">,</span> 
              <span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg2_type</span><span class="special">,</span> <span class="special">...</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="id812550"></a><h2>Description</h2>
+<a name="id820590"></a><h2>Description</h2>
 <p>This function object aggregates together calls to functions of all the specified function types <code class="computeroutput">F1</code>, <code class="computeroutput">F2</code>, etc which must have distinct function signatures from one another.</p>
 <p><span class="bold"><strong>Parameters:</strong></span> </p>
 <div class="informaltable"><table class="table">
@@ -65,30 +65,30 @@
 </p>
 <p>In some cases, the  <code class="computeroutput"><a class="link" href="make_overloaded_function.html" title="Function template make_overloaded_function">make_overloaded_function</a></code> function template can be useful to construct an overloaded function object without explicitly specifying the function types.</p>
 <p>At least two distinct function types must be specified (because there is nothing to overload between one or zero functions). The maximum number of functions to overload is given by the  <code class="computeroutput"><a class="link" href="../BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html" title="Macro BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX">BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX</a></code> configuration macro. The maximum number of function parameters for each of the specified function types is given by the  <code class="computeroutput"><a class="link" href="../BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html" title="Macro BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX">BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX</a></code> configuration macro.</p>
-<p><span class="bold"><strong>See:</strong></span>  <a class="link" href="../boost_functional_overloadedfunction/Tutorial.html" title="Tutorial">Tutorial</a> section,  <code class="computeroutput"><a class="link" href="make_overloaded_function.html" title="Function template make_overloaded_function">make_overloaded_function</a></code>,  <code class="computeroutput"><a class="link" href="../BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html" title="Macro BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX">BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX</a></code>,  <code class="computeroutput"><a class="link" href="../BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html" title="Macro BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX">BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX</a></code>, Boost.Function. </p>
+<p><span class="bold"><strong>See:</strong></span>  <a class="link" href="../boost_functional_overloadedfunction/tutorial.html" title="Tutorial"> Tutorial</a> section,  <code class="computeroutput"><a class="link" href="make_overloaded_function.html" title="Function template make_overloaded_function">make_overloaded_function</a></code>,  <code class="computeroutput"><a class="link" href="../BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html" title="Macro BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX">BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX</a></code>,  <code class="computeroutput"><a class="link" href="../BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX.html" title="Macro BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX">BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_ARITY_MAX</a></code>, Boost.Function. </p>
 <div class="refsect2">
-<a name="id812697"></a><h3>
+<a name="id820738"></a><h3>
 <a name="boost.overloaded_functionconstruct-copy-destruct"></a><code class="computeroutput">overloaded_function</code> 
         public
        construct/copy/destruct</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem">
-<pre class="literallayout"><a name="id313151-bb"></a><span class="identifier">overloaded_function</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span> <span class="special">&amp;</span><span class="special">,</span> 
+<pre class="literallayout"><a name="id259090-bb"></a><span class="identifier">overloaded_function</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span> <span class="special">&amp;</span><span class="special">,</span> 
                     <span class="keyword">const</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span> <span class="special">&amp;</span><span class="special">,</span> <span class="special">...</span><span class="special">)</span><span class="special">;</span></pre>Construct the overloaded function object. <p>Any function pointer, function reference, and monomorphic function object that can be converted to a <code class="computeroutput">boost::function</code> function object can be specified as parameter.</p>
 <p><span class="bold"><strong>Note:</strong></span> Unfortunately, it is not possible to support polymorphic function objects (as explained <a href="http://lists.boost.org/Archives/boost/2012/03/191744.php" target="_top">here</a>). </p>
 </li></ol></div>
 </div>
 <div class="refsect2">
-<a name="id812834"></a><h3>
-<a name="id313082-bb"></a><code class="computeroutput">overloaded_function</code> public member functions</h3>
+<a name="id820874"></a><h3>
+<a name="id259020-bb"></a><code class="computeroutput">overloaded_function</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
 <pre class="literallayout"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">result_type</span> 
-<a name="id313084-bb"></a><span class="keyword">operator</span><span class="special">(</span><span class="special">)</span><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg1_type</span><span class="special">,</span> 
+<a name="id259023-bb"></a><span class="keyword">operator</span><span class="special">(</span><span class="special">)</span><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg1_type</span><span class="special">,</span> 
            <span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F1</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg2_type</span><span class="special">,</span> <span class="special">...</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre>Call operator matching the signature of the function type specified as 1st template parameter. <p>This will in turn invoke the call operator of the 1st function passed to the constructor. </p>
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">result_type</span> 
-<a name="id313110-bb"></a><span class="keyword">operator</span><span class="special">(</span><span class="special">)</span><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg1_type</span><span class="special">,</span> 
+<a name="id259049-bb"></a><span class="keyword">operator</span><span class="special">(</span><span class="special">)</span><span class="special">(</span><span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg1_type</span><span class="special">,</span> 
            <span class="keyword">typename</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function_traits</span><span class="special">&lt;</span> <span class="identifier">F2</span> <span class="special">&gt;</span><span class="special">::</span><span class="identifier">arg2_type</span><span class="special">,</span> <span class="special">...</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre>Call operator matching the signature of the function type specified as 2nd template parameter. <p>This will in turn invoke the call operator of the 2nd function passed to the constructor.</p>
 <p><span class="bold"><strong>Note:</strong></span> Similar call operators are present for all specified function types <code class="computeroutput">F1</code>, <code class="computeroutput">F2</code>, etc (even if not exhaustively listed by this documentation). </p>
 </li>
diff --git a/overloaded_function/doc/html/boost_functional_overloadedfunction/Acknowledgments.html b/overloaded_function/doc/html/boost_functional_overloadedfunction/acknowledgments.html
similarity index 95%
rename from overloaded_function/doc/html/boost_functional_overloadedfunction/Acknowledgments.html
rename to overloaded_function/doc/html/boost_functional_overloadedfunction/acknowledgments.html
index f03dd92..605d481 100644
--- a/overloaded_function/doc/html/boost_functional_overloadedfunction/Acknowledgments.html
+++ b/overloaded_function/doc/html/boost_functional_overloadedfunction/acknowledgments.html
@@ -21,9 +21,9 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a>
 </div>
-<div class="section boost_functional_overloadedfunction_Acknowledgments">
+<div class="section boost_functional_overloadedfunction_acknowledgments">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_overloadedfunction.Acknowledgments"></a><a class="link" href="Acknowledgments.html" title="Acknowledgments">Acknowledgments</a>
+<a name="boost_functional_overloadedfunction.acknowledgments"></a><a class="link" href="acknowledgments.html" title="Acknowledgments">Acknowledgments</a>
 </h2></div></div></div>
 <p>
       Many thanks to Mathias Gaunard for suggesting to implement <code class="computeroutput"><a class="link" href="../boost/overloaded_function.html" title="Class template overloaded_function">boost::overloaded_function</a></code>
diff --git a/overloaded_function/doc/html/boost_functional_overloadedfunction/Getting_Started.html b/overloaded_function/doc/html/boost_functional_overloadedfunction/getting_started.html
similarity index 82%
rename from overloaded_function/doc/html/boost_functional_overloadedfunction/Getting_Started.html
rename to overloaded_function/doc/html/boost_functional_overloadedfunction/getting_started.html
index 6ac82c8..459e7d5 100644
--- a/overloaded_function/doc/html/boost_functional_overloadedfunction/Getting_Started.html
+++ b/overloaded_function/doc/html/boost_functional_overloadedfunction/getting_started.html
@@ -7,7 +7,7 @@
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.Functional/OverloadedFunction 1.0.0">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.Functional/OverloadedFunction 1.0.0">
 <link rel="prev" href="../index.html" title="Chapter&#160;1.&#160;Boost.Functional/OverloadedFunction 1.0.0">
-<link rel="next" href="Tutorial.html" title="Tutorial">
+<link rel="next" href="tutorial.html" title="Tutorial">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,24 +20,24 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="Tutorial.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../index.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tutorial.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section boost_functional_overloadedfunction_Getting_Started">
+<div class="section boost_functional_overloadedfunction_getting_started">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_overloadedfunction.Getting_Started"></a><a class="link" href="Getting_Started.html" title="Getting Started">Getting
+<a name="boost_functional_overloadedfunction.getting_started"></a><a class="link" href="getting_started.html" title="Getting Started">Getting
     Started</a>
 </h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="Getting_Started.html#boost_functional_overloadedfunction.Getting_Started.compilers_and_platforms">Compilers
+<dt><span class="section"><a href="getting_started.html#boost_functional_overloadedfunction.getting_started.compilers_and_platforms">Compilers
       and Platforms</a></span></dt>
-<dt><span class="section"><a href="Getting_Started.html#boost_functional_overloadedfunction.Getting_Started.installation">Installation</a></span></dt>
+<dt><span class="section"><a href="getting_started.html#boost_functional_overloadedfunction.getting_started.installation">Installation</a></span></dt>
 </dl></div>
 <p>
       This section explains how to setup a system to use this library.
     </p>
-<div class="section boost_functional_overloadedfunction_Getting_Started_compilers_and_platforms">
+<div class="section boost_functional_overloadedfunction_getting_started_compilers_and_platforms">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functional_overloadedfunction.Getting_Started.compilers_and_platforms"></a><a class="link" href="Getting_Started.html#boost_functional_overloadedfunction.Getting_Started.compilers_and_platforms" title="Compilers and Platforms">Compilers
+<a name="boost_functional_overloadedfunction.getting_started.compilers_and_platforms"></a><a class="link" href="getting_started.html#boost_functional_overloadedfunction.getting_started.compilers_and_platforms" title="Compilers and Platforms">Compilers
       and Platforms</a>
 </h3></div></div></div>
 <p>
@@ -60,9 +60,9 @@
         for any special configuration that might be required for a specific compiler.
       </p>
 </div>
-<div class="section boost_functional_overloadedfunction_Getting_Started_installation">
+<div class="section boost_functional_overloadedfunction_getting_started_installation">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functional_overloadedfunction.Getting_Started.installation"></a><a class="link" href="Getting_Started.html#boost_functional_overloadedfunction.Getting_Started.installation" title="Installation">Installation</a>
+<a name="boost_functional_overloadedfunction.getting_started.installation"></a><a class="link" href="getting_started.html#boost_functional_overloadedfunction.getting_started.installation" title="Installation">Installation</a>
 </h3></div></div></div>
 <p>
         This library is composed of header files only. Therefore there is no pre-compiled
@@ -89,7 +89,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="Tutorial.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../index.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tutorial.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/overloaded_function/doc/html/boost_functional_overloadedfunction/Tutorial.html b/overloaded_function/doc/html/boost_functional_overloadedfunction/tutorial.html
similarity index 93%
rename from overloaded_function/doc/html/boost_functional_overloadedfunction/Tutorial.html
rename to overloaded_function/doc/html/boost_functional_overloadedfunction/tutorial.html
index 8211939..98493ac 100644
--- a/overloaded_function/doc/html/boost_functional_overloadedfunction/Tutorial.html
+++ b/overloaded_function/doc/html/boost_functional_overloadedfunction/tutorial.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.Functional/OverloadedFunction 1.0.0">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.Functional/OverloadedFunction 1.0.0">
-<link rel="prev" href="Getting_Started.html" title="Getting Started">
+<link rel="prev" href="getting_started.html" title="Getting Started">
 <link rel="next" href="../reference.html" title="Reference">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,23 +20,23 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="Getting_Started.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../reference.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="getting_started.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../reference.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section boost_functional_overloadedfunction_Tutorial">
+<div class="section boost_functional_overloadedfunction_tutorial">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_overloadedfunction.Tutorial"></a><a class="link" href="Tutorial.html" title="Tutorial">Tutorial</a>
+<a name="boost_functional_overloadedfunction.tutorial"></a><a class="link" href="tutorial.html" title="Tutorial">Tutorial</a>
 </h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="Tutorial.html#boost_functional_overloadedfunction.Tutorial.overloading">Overloading</a></span></dt>
-<dt><span class="section"><a href="Tutorial.html#boost_functional_overloadedfunction.Tutorial.without_function_types">Without
+<dt><span class="section"><a href="tutorial.html#boost_functional_overloadedfunction.tutorial.overloading">Overloading</a></span></dt>
+<dt><span class="section"><a href="tutorial.html#boost_functional_overloadedfunction.tutorial.without_function_types">Without
       Function Types</a></span></dt>
 </dl></div>
 <p>
       This section explains how to use this library.
     </p>
-<div class="section boost_functional_overloadedfunction_Tutorial_overloading">
+<div class="section boost_functional_overloadedfunction_tutorial_overloading">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functional_overloadedfunction.Tutorial.overloading"></a><a class="link" href="Tutorial.html#boost_functional_overloadedfunction.Tutorial.overloading" title="Overloading">Overloading</a>
+<a name="boost_functional_overloadedfunction.tutorial.overloading"></a><a class="link" href="tutorial.html#boost_functional_overloadedfunction.tutorial.overloading" title="Overloading">Overloading</a>
 </h3></div></div></div>
 <p>
         Consider the following functions which have distinct signatures:
@@ -87,7 +87,7 @@
 <p>
         Then the relative function pointers, function references, or <a href="http://en.wikipedia.org/wiki/Polymorphism_(computer_science)" target="_top">monomorphic
         function</a> objects are passed to the <code class="computeroutput"><a class="link" href="../boost/overloaded_function.html" title="Class template overloaded_function">boost::overloaded_function</a></code>
-        constructor matching the order of the specified template parameters. <sup>[<a name="boost_functional_overloadedfunction.Tutorial.overloading.f0" href="#ftn.boost_functional_overloadedfunction.Tutorial.overloading.f0" class="footnote">2</a>]</sup> In the above example, <code class="computeroutput"><span class="identifier">identity_s</span></code>
+        constructor matching the order of the specified template parameters. <sup>[<a name="boost_functional_overloadedfunction.tutorial.overloading.f0" href="#ftn.boost_functional_overloadedfunction.tutorial.overloading.f0" class="footnote">2</a>]</sup> In the above example, <code class="computeroutput"><span class="identifier">identity_s</span></code>
         is passed as a function pointer (the function address is automatically taken
         from the function name by the compiler), <code class="computeroutput"><span class="identifier">identity_i</span></code>
         as a function reference, and <code class="computeroutput"><span class="identifier">identity_d</span></code>
@@ -95,14 +95,14 @@
       </p>
 <p>
         All specified function types must have distinct parameters from one another
-        (so the overloaded calls can be resolved by this library). <sup>[<a name="boost_functional_overloadedfunction.Tutorial.overloading.f1" href="#ftn.boost_functional_overloadedfunction.Tutorial.overloading.f1" class="footnote">3</a>]</sup> In order to create an overloaded function object, it is necessary
+        (so the overloaded calls can be resolved by this library). <sup>[<a name="boost_functional_overloadedfunction.tutorial.overloading.f1" href="#ftn.boost_functional_overloadedfunction.tutorial.overloading.f1" class="footnote">3</a>]</sup> In order to create an overloaded function object, it is necessary
         to specify at least two function types (because there is nothing to overload
         between one or zero functions).
       </p>
 </div>
-<div class="section boost_functional_overloadedfunction_Tutorial_without_function_types">
+<div class="section boost_functional_overloadedfunction_tutorial_without_function_types">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functional_overloadedfunction.Tutorial.without_function_types"></a><a class="link" href="Tutorial.html#boost_functional_overloadedfunction.Tutorial.without_function_types" title="Without Function Types">Without
+<a name="boost_functional_overloadedfunction.tutorial.without_function_types"></a><a class="link" href="tutorial.html#boost_functional_overloadedfunction.tutorial.without_function_types" title="Without Function Types">Without
       Function Types</a>
 </h3></div></div></div>
 <p>
@@ -189,7 +189,7 @@
 </div>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a id="ftn.boost_functional_overloadedfunction.Tutorial.overloading.f0" href="#boost_functional_overloadedfunction.Tutorial.overloading.f0" class="para">2</a>] </sup>
+<div class="footnote"><p><sup>[<a id="ftn.boost_functional_overloadedfunction.tutorial.overloading.f0" href="#boost_functional_overloadedfunction.tutorial.overloading.f0" class="para">2</a>] </sup>
           Function pointers are of the form <code class="literal"><span class="emphasis"><em>result-type </em></span></code><code class="computeroutput"><span class="special">(*)(</span></code><code class="literal"><span class="emphasis"><em>argument1-type</em></span></code><code class="computeroutput"><span class="special">,</span> <span class="special">...)</span></code> (the
           C++ compiler is usually able to automatically promote a function name to
           a function pointer in a context where a function pointer is expected even
@@ -204,7 +204,7 @@
           Unfortunately, it is not possible to support polymorphic function objects
           (see <a href="http://lists.boost.org/Archives/boost/2012/03/191744.php" target="_top">http://lists.boost.org/Archives/boost/2012/03/191744.php</a>).
         </p></div>
-<div class="footnote"><p><sup>[<a id="ftn.boost_functional_overloadedfunction.Tutorial.overloading.f1" href="#boost_functional_overloadedfunction.Tutorial.overloading.f1" class="para">3</a>] </sup>
+<div class="footnote"><p><sup>[<a id="ftn.boost_functional_overloadedfunction.tutorial.overloading.f1" href="#boost_functional_overloadedfunction.tutorial.overloading.f1" class="para">3</a>] </sup>
           Note that in C++ the function result type is not used for overload resolution
           (to avoid making the overload resolution context dependent). Therefore,
           at least one of the function parameters must be distinct for each specified
@@ -222,7 +222,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="Getting_Started.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../reference.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="getting_started.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../reference.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/overloaded_function/doc/html/index.html b/overloaded_function/doc/html/index.html
index c9f1f8d..5e6c0e9 100644
--- a/overloaded_function/doc/html/index.html
+++ b/overloaded_function/doc/html/index.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Chapter&#160;1.&#160;Boost.Functional/OverloadedFunction 1.0.0">
-<link rel="next" href="boost_functional_overloadedfunction/Getting_Started.html" title="Getting Started">
+<link rel="next" href="boost_functional_overloadedfunction/getting_started.html" title="Getting Started">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -17,7 +17,7 @@
 <td align="center"><a href="../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
-<div class="spirit-nav"><a accesskey="n" href="boost_functional_overloadedfunction/Getting_Started.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a></div>
+<div class="spirit-nav"><a accesskey="n" href="boost_functional_overloadedfunction/getting_started.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a></div>
 <div class="chapter">
 <div class="titlepage"><div>
 <div><h2 class="title">
@@ -36,18 +36,18 @@
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class="section"><a href="index.html#boost_functional_overloadedfunction.Introduction">Introduction</a></span></dt>
-<dt><span class="section"><a href="boost_functional_overloadedfunction/Getting_Started.html">Getting
+<dt><span class="section"><a href="index.html#boost_functional_overloadedfunction.introduction">Introduction</a></span></dt>
+<dt><span class="section"><a href="boost_functional_overloadedfunction/getting_started.html">Getting
     Started</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_functional_overloadedfunction/Getting_Started.html#boost_functional_overloadedfunction.Getting_Started.compilers_and_platforms">Compilers
+<dt><span class="section"><a href="boost_functional_overloadedfunction/getting_started.html#boost_functional_overloadedfunction.getting_started.compilers_and_platforms">Compilers
       and Platforms</a></span></dt>
-<dt><span class="section"><a href="boost_functional_overloadedfunction/Getting_Started.html#boost_functional_overloadedfunction.Getting_Started.installation">Installation</a></span></dt>
+<dt><span class="section"><a href="boost_functional_overloadedfunction/getting_started.html#boost_functional_overloadedfunction.getting_started.installation">Installation</a></span></dt>
 </dl></dd>
-<dt><span class="section"><a href="boost_functional_overloadedfunction/Tutorial.html">Tutorial</a></span></dt>
+<dt><span class="section"><a href="boost_functional_overloadedfunction/tutorial.html">Tutorial</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_functional_overloadedfunction/Tutorial.html#boost_functional_overloadedfunction.Tutorial.overloading">Overloading</a></span></dt>
-<dt><span class="section"><a href="boost_functional_overloadedfunction/Tutorial.html#boost_functional_overloadedfunction.Tutorial.without_function_types">Without
+<dt><span class="section"><a href="boost_functional_overloadedfunction/tutorial.html#boost_functional_overloadedfunction.tutorial.overloading">Overloading</a></span></dt>
+<dt><span class="section"><a href="boost_functional_overloadedfunction/tutorial.html#boost_functional_overloadedfunction.tutorial.without_function_types">Without
       Function Types</a></span></dt>
 </dl></dd>
 <dt><span class="section"><a href="reference.html">Reference</a></span></dt>
@@ -55,15 +55,15 @@
 <dt><span class="section"><a href="reference.html#header.boost.functional.overloaded_function_hpp">Header &lt;boost/functional/overloaded_function.hpp&gt;</a></span></dt>
 <dt><span class="section"><a href="reference.html#header.boost.functional.overloaded_function.config_hpp">Header &lt;boost/functional/overloaded_function/config.hpp&gt;</a></span></dt>
 </dl></dd>
-<dt><span class="section"><a href="boost_functional_overloadedfunction/Acknowledgments.html">Acknowledgments</a></span></dt>
+<dt><span class="section"><a href="boost_functional_overloadedfunction/acknowledgments.html">Acknowledgments</a></span></dt>
 </dl>
 </div>
 <p>
     This library allows to overload different functions into a single function object.
   </p>
-<div class="section boost_functional_overloadedfunction_Introduction">
+<div class="section boost_functional_overloadedfunction_introduction">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functional_overloadedfunction.Introduction"></a><a class="link" href="index.html#boost_functional_overloadedfunction.Introduction" title="Introduction">Introduction</a>
+<a name="boost_functional_overloadedfunction.introduction"></a><a class="link" href="index.html#boost_functional_overloadedfunction.introduction" title="Introduction">Introduction</a>
 </h2></div></div></div>
 <p>
       Consider the following functions which have distinct signatures:
@@ -84,7 +84,7 @@
 <p>
       Instead of calling them using their separate names (here <code class="computeroutput"><span class="identifier">BOOST_TEST</span></code>
       is equivalent to <code class="computeroutput"><span class="identifier">assert</span></code>):
-      <sup>[<a name="boost_functional_overloadedfunction.Introduction.f0" href="#ftn.boost_functional_overloadedfunction.Introduction.f0" class="footnote">1</a>]</sup>
+      <sup>[<a name="boost_functional_overloadedfunction.introduction.f0" href="#ftn.boost_functional_overloadedfunction.introduction.f0" class="footnote">1</a>]</sup>
     </p>
 <p>
 </p>
@@ -125,7 +125,7 @@
 </div>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a id="ftn.boost_functional_overloadedfunction.Introduction.f0" href="#boost_functional_overloadedfunction.Introduction.f0" class="para">1</a>] </sup>
+<div class="footnote"><p><sup>[<a id="ftn.boost_functional_overloadedfunction.introduction.f0" href="#boost_functional_overloadedfunction.introduction.f0" class="para">1</a>] </sup>
         In most of the examples presented in this documentation, the Boost.Detail/LightweightTest
         (<code class="literal">boost/detail/lightweight_test.hpp</code>) macro <code class="computeroutput"><span class="identifier">BOOST_TEST</span></code> is used to check correctness
         conditions (conceptually similar to <code class="computeroutput"><span class="identifier">assert</span></code>).
@@ -138,10 +138,10 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: April 13, 2012 at 00:59:44 GMT</small></p></td>
+<td align="left"><p><small>Last revised: April 28, 2012 at 02:19:13 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
-<div class="spirit-nav"><a accesskey="n" href="boost_functional_overloadedfunction/Getting_Started.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a></div>
+<div class="spirit-nav"><a accesskey="n" href="boost_functional_overloadedfunction/getting_started.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a></div>
 </body>
 </html>
diff --git a/overloaded_function/doc/html/reference.html b/overloaded_function/doc/html/reference.html
index 3fcf6f5..55a89f0 100644
--- a/overloaded_function/doc/html/reference.html
+++ b/overloaded_function/doc/html/reference.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Chapter&#160;1.&#160;Boost.Functional/OverloadedFunction 1.0.0">
 <link rel="up" href="index.html" title="Chapter&#160;1.&#160;Boost.Functional/OverloadedFunction 1.0.0">
-<link rel="prev" href="boost_functional_overloadedfunction/Tutorial.html" title="Tutorial">
+<link rel="prev" href="boost_functional_overloadedfunction/tutorial.html" title="Tutorial">
 <link rel="next" href="boost/overloaded_function.html" title="Class template overloaded_function">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="boost_functional_overloadedfunction/Tutorial.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="boost/overloaded_function.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="boost_functional_overloadedfunction/tutorial.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="boost/overloaded_function.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section reference">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -60,7 +60,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="boost_functional_overloadedfunction/Tutorial.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="boost/overloaded_function.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="boost_functional_overloadedfunction/tutorial.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="boost/overloaded_function.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>

From e75e6d7eda9cb2b1471802bce2a36d8835e4dff5 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 18 Aug 2013 09:48:53 +0000
Subject: [PATCH 106/111] Merge Hash. Fixes #8568, Refs #8822.#8822.#8822.

[SVN r85389]
---
 .../functional/hash/detail/hash_float.hpp     | 31 ++++++++-----------
 include/boost/functional/hash/hash.hpp        | 11 +++++++
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/functional/hash/detail/hash_float.hpp
index a98cd70..2ac22da 100644
--- a/include/boost/functional/hash/detail/hash_float.hpp
+++ b/include/boost/functional/hash/detail/hash_float.hpp
@@ -90,15 +90,20 @@ namespace boost
             return seed;
         }
 
+        template <typename Float, unsigned digits, unsigned max_exponent>
+        struct enable_binary_hash
+        {
+            BOOST_STATIC_CONSTANT(bool, value =
+                std::numeric_limits<Float>::is_iec559 &&
+                std::numeric_limits<Float>::digits == digits &&
+                std::numeric_limits<Float>::radix == 2 &&
+                std::numeric_limits<Float>::max_exponent == max_exponent);
+        };
+
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
             BOOST_DEDUCED_TYPENAME boost::enable_if_c<
-                std::numeric_limits<Float>::is_iec559 &&
-                std::numeric_limits<Float>::digits == 24 &&
-                std::numeric_limits<Float>::radix == 2 &&
-                std::numeric_limits<Float>::max_exponent == 128,
-                int>::type
-            )
+                enable_binary_hash<Float, 24, 128>::value, int>::type)
         {
             return hash_binary((char*) &v, 4);
         }
@@ -107,12 +112,7 @@ namespace boost
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
             BOOST_DEDUCED_TYPENAME boost::enable_if_c<
-                std::numeric_limits<Float>::is_iec559 &&
-                std::numeric_limits<Float>::digits == 53 &&
-                std::numeric_limits<Float>::radix == 2 &&
-                std::numeric_limits<Float>::max_exponent == 1024,
-                int>::type
-            )
+                enable_binary_hash<Float, 53, 1024>::value, int>::type)
         {
             return hash_binary((char*) &v, 8);
         }
@@ -120,12 +120,7 @@ namespace boost
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
             BOOST_DEDUCED_TYPENAME boost::enable_if_c<
-                std::numeric_limits<Float>::is_iec559 &&
-                std::numeric_limits<Float>::digits == 64 &&
-                std::numeric_limits<Float>::radix == 2 &&
-                std::numeric_limits<Float>::max_exponent == 16384,
-                int>::type
-            )
+                enable_binary_hash<Float, 64, 16384>::value, int>::type)
         {
             return hash_binary((char*) &v, 10);
         }
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index aa4e49f..0adf9c9 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -27,6 +27,13 @@
 #include <typeindex>
 #endif
 
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#pragma warning(disable:6295) // Ill-defined for-loop : 'unsigned int' values
+                              // are always of range '0' to '4294967295'.
+                              // Loop executes infinitely.
+#endif
+
 #if BOOST_WORKAROUND(__GNUC__, < 3) \
     && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
 #define BOOST_HASH_CHAR_TRAITS string_char_traits
@@ -518,6 +525,10 @@ namespace boost
 
 #undef BOOST_HASH_CHAR_TRAITS
 
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
 #endif // BOOST_FUNCTIONAL_HASH_HASH_HPP
 
 // Include this outside of the include guards in case the file is included

From 9eb6f1fda48afdf7b2051063a320d17717ac9b70 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 8 Oct 2013 21:26:30 +0000
Subject: [PATCH 107/111] Merge release notes + float hash fix. Ref #8822.

[SVN r86210]
---
 hash/doc/changes.qbk                            |  9 +++++++++
 .../boost/functional/hash/detail/hash_float.hpp | 17 ++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk
index 4ca0814..c824e1a 100644
--- a/hash/doc/changes.qbk
+++ b/hash/doc/changes.qbk
@@ -3,6 +3,8 @@
  / Distributed under 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) ]
 
+[template ticket[number]'''<ulink url="https://svn.boost.org/trac/boost/ticket/'''[number]'''">'''#[number]'''</ulink>''']
+
 [section:changes Change Log]
 
 [h2 Boost 1.33.0]
@@ -160,4 +162,11 @@
 * [@https://svn.boost.org/trac/boost/ticket/7957 Ticket 7957]:
   Fixed a typo.
 
+[h2 Boost 1.55.0]
+
+* Simplify a SFINAE check so that it will hopefully work on Sun 5.9
+  ([ticket 8822]).
+* Suppress Visual C++ infinite loop warning ([ticket 8568]).
+
+
 [endsect]
diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/functional/hash/detail/hash_float.hpp
index 2ac22da..7c3de31 100644
--- a/include/boost/functional/hash/detail/hash_float.hpp
+++ b/include/boost/functional/hash/detail/hash_float.hpp
@@ -103,7 +103,8 @@ namespace boost
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
             BOOST_DEDUCED_TYPENAME boost::enable_if_c<
-                enable_binary_hash<Float, 24, 128>::value, int>::type)
+                enable_binary_hash<Float, 24, 128>::value,
+                std::size_t>::type)
         {
             return hash_binary((char*) &v, 4);
         }
@@ -112,7 +113,8 @@ namespace boost
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
             BOOST_DEDUCED_TYPENAME boost::enable_if_c<
-                enable_binary_hash<Float, 53, 1024>::value, int>::type)
+                enable_binary_hash<Float, 53, 1024>::value,
+                std::size_t>::type)
         {
             return hash_binary((char*) &v, 8);
         }
@@ -120,7 +122,8 @@ namespace boost
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
             BOOST_DEDUCED_TYPENAME boost::enable_if_c<
-                enable_binary_hash<Float, 64, 16384>::value, int>::type)
+                enable_binary_hash<Float, 64, 16384>::value,
+                std::size_t>::type)
         {
             return hash_binary((char*) &v, 10);
         }
@@ -128,12 +131,8 @@ namespace boost
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
             BOOST_DEDUCED_TYPENAME boost::enable_if_c<
-                std::numeric_limits<Float>::is_iec559 &&
-                std::numeric_limits<Float>::digits == 113 &&
-                std::numeric_limits<Float>::radix == 2 &&
-                std::numeric_limits<Float>::max_exponent == 16384,
-                int>::type
-            )
+                enable_binary_hash<Float, 113, 16384>::value,
+                std::size_t>::type)
         {
             return hash_binary((char*) &v, 16);
         }

From f5731a878fccbeeea712bc0caae97159ba84575c Mon Sep 17 00:00:00 2001
From: Michel Morin <mimomorin@gmail.com>
Date: Wed, 13 Nov 2013 03:22:55 +0000
Subject: [PATCH 108/111] Merge r86524 (Correct broken links to C++ standard
 papers); fixes #9212

[SVN r86673]
---
 binders.html  | 2 +-
 index.html    | 2 +-
 mem_fun.html  | 2 +-
 negators.html | 2 +-
 ptr_fun.html  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/binders.html b/binders.html
index 30c2c4b..c3443fe 100644
--- a/binders.html
+++ b/binders.html
@@ -121,7 +121,7 @@ public:
   be <tt>std::ostream&amp;&amp;</tt>. Since you cannot have a reference to a
   reference, at this point we should get a compilation error because
   references to references are illegal in C++ (but see <a href=
-  "http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
+  "http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
   Standard core language active issues list</a>).</p>
 
   <p>The binders in this library avoid this problem by using the Boost
diff --git a/index.html b/index.html
index 86d8bac..f4315a0 100644
--- a/index.html
+++ b/index.html
@@ -228,7 +228,7 @@ std::for_each(c.begin(), c.end(),
     <li>The Standard Committee has recognised the problem of references to
     references occurring during template instantiation and has moved to fix
     the standard (see the <a href=
-    "http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
+    "http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
     standard core language active issues list</a>).</li>
   </ol>
 
diff --git a/mem_fun.html b/mem_fun.html
index 23dc102..54d3aee 100644
--- a/mem_fun.html
+++ b/mem_fun.html
@@ -151,7 +151,7 @@ public:
   declaring the argument as <tt>const&nbsp;A&amp;</tt>, then if A were a
   reference type, we would have a reference to a reference, which is
   currently illegal (but see <a href=
-  "http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++ core
+  "http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#106">C++ core
   language issue number 106)</a></p>
 
   <p>So the way in which we want to declare the second argument for
diff --git a/negators.html b/negators.html
index 9d31750..5af3c54 100644
--- a/negators.html
+++ b/negators.html
@@ -99,7 +99,7 @@ public:
   <p>Note that if the Predicate's <tt>argument_type</tt> is a reference, the
   type of <tt>operator()</tt>'s argument would be a reference to a reference.
   Currently this is illegal in C++ (but see the <a href=
-  "http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
+  "http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#106">C++
   standard core language active issues list</a>).</p>
 
   <p>However, if we instead defined <tt>operator()</tt> to accept Predicate's
diff --git a/ptr_fun.html b/ptr_fun.html
index 0dc62b4..a8ba265 100644
--- a/ptr_fun.html
+++ b/ptr_fun.html
@@ -108,7 +108,7 @@ public:
   declaring the argument as <tt>const&nbsp;Arg&amp;</tt>, then if Arg were a
   reference type, we would have a reference to a reference, which is
   currently illegal (but see <a href=
-  "http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#106">C++ core
+  "http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#106">C++ core
   language issue number 106)</a></p>
 
   <p>So the way in which we want to declare the argument for

From 26af234c23f0eeea3474f10b3e89aff5a82bb896 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 16 Nov 2013 20:36:27 +0000
Subject: [PATCH 109/111] Merge unordered and hash from trunk.

- Only use Visual C++ pragma with appropriate compilers.
- Working link for Thomas Wang's hash function.
- Updated unordered rationale.
- Fix `unnecessary_copy_tests` for Visual C++ 12.
- Some extra insert tests.


[SVN r86728]
---
 hash/doc/rationale.qbk                 | 2 +-
 include/boost/functional/hash/hash.hpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/hash/doc/rationale.qbk b/hash/doc/rationale.qbk
index 8621081..76ff6d1 100644
--- a/hash/doc/rationale.qbk
+++ b/hash/doc/rationale.qbk
@@ -34,7 +34,7 @@ For other use cases, if you do need a higher quality hash function,
 then neither the standard hash function or `boost::hash` are appropriate.
 There are several options
 available. One is to use a second hash on the output of this hash
-function, such as [@http://www.concentric.net/~ttwang/tech/inthash.htm
+function, such as [@http://web.archive.org/web/20121102023700/http://www.concentric.net/~Ttwang/tech/inthash.htm
 Thomas Wang's hash function]. This this may not work as
 well as a hash algorithm tailored for the input.
 
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 0adf9c9..42ea019 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -29,11 +29,15 @@
 
 #if defined(BOOST_MSVC)
 #pragma warning(push)
+
+#if BOOST_MSVC >= 1400
 #pragma warning(disable:6295) // Ill-defined for-loop : 'unsigned int' values
                               // are always of range '0' to '4294967295'.
                               // Loop executes infinitely.
 #endif
 
+#endif
+
 #if BOOST_WORKAROUND(__GNUC__, < 3) \
     && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
 #define BOOST_HASH_CHAR_TRAITS string_char_traits

From ac79bdc9112f647e2ea3316bc724a77818a4f925 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 10 Dec 2013 23:40:22 +0000
Subject: [PATCH 110/111] Remove old files accidentally restored by conversion.

---
 include/boost/functional/hash/Attic/deque.hpp | 21 ------------------
 include/boost/functional/hash/Attic/list.hpp  | 21 ------------------
 include/boost/functional/hash/Attic/map.hpp   | 22 -------------------
 include/boost/functional/hash/Attic/pair.hpp  | 20 -----------------
 include/boost/functional/hash/Attic/set.hpp   | 21 ------------------
 .../boost/functional/hash/Attic/vector.hpp    | 20 -----------------
 6 files changed, 125 deletions(-)
 delete mode 100644 include/boost/functional/hash/Attic/deque.hpp
 delete mode 100644 include/boost/functional/hash/Attic/list.hpp
 delete mode 100644 include/boost/functional/hash/Attic/map.hpp
 delete mode 100644 include/boost/functional/hash/Attic/pair.hpp
 delete mode 100644 include/boost/functional/hash/Attic/set.hpp
 delete mode 100644 include/boost/functional/hash/Attic/vector.hpp

diff --git a/include/boost/functional/hash/Attic/deque.hpp b/include/boost/functional/hash/Attic/deque.hpp
deleted file mode 100644
index 0f688cd..0000000
--- a/include/boost/functional/hash/Attic/deque.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_DEQUE_HPP)
-#define BOOST_FUNCTIONAL_HASH_DEQUE_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif
-
diff --git a/include/boost/functional/hash/Attic/list.hpp b/include/boost/functional/hash/Attic/list.hpp
deleted file mode 100644
index f332462..0000000
--- a/include/boost/functional/hash/Attic/list.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_LIST_HPP)
-#define BOOST_FUNCTIONAL_HASH_LIST_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif
-
diff --git a/include/boost/functional/hash/Attic/map.hpp b/include/boost/functional/hash/Attic/map.hpp
deleted file mode 100644
index 10526a1..0000000
--- a/include/boost/functional/hash/Attic/map.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_MAP_HPP)
-#define BOOST_FUNCTIONAL_HASH_MAP_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif
-
-
diff --git a/include/boost/functional/hash/Attic/pair.hpp b/include/boost/functional/hash/Attic/pair.hpp
deleted file mode 100644
index 9c54671..0000000
--- a/include/boost/functional/hash/Attic/pair.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_PAIR_HPP)
-#define BOOST_FUNCTIONAL_HASH_PAIR_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif
diff --git a/include/boost/functional/hash/Attic/set.hpp b/include/boost/functional/hash/Attic/set.hpp
deleted file mode 100644
index 53923e1..0000000
--- a/include/boost/functional/hash/Attic/set.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_SET_HPP)
-#define BOOST_FUNCTIONAL_HASH_SET_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif
-
diff --git a/include/boost/functional/hash/Attic/vector.hpp b/include/boost/functional/hash/Attic/vector.hpp
deleted file mode 100644
index 5a75f8c..0000000
--- a/include/boost/functional/hash/Attic/vector.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-
-//  Copyright Daniel James 2005-2006. 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)
-
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_VECTOR_HPP)
-#define BOOST_FUNCTIONAL_HASH_VECTOR_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#warning "boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead."
-#include <boost/functional/hash.hpp>
-
-#endif

From 2a0d1be60b0860b35fba4273855bff1e2578a7d2 Mon Sep 17 00:00:00 2001
From: Billy Donahue <billydonahue@google.com>
Date: Sat, 12 Sep 2015 17:12:02 -0400
Subject: [PATCH 111/111] doc: BOOST_HASH_SPECIALIZE_REF passes by const ref

---
 include/boost/functional/hash/hash.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 3e5ab5b..2fb9f21 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -411,7 +411,7 @@ namespace boost
     // passed by copy.
     //
     // BOOST_HASH_SPECIALIZE_REF - define a specialization for a type which is
-    // passed by copy.
+    // passed by const reference.
     //
     // These are undefined later.