Cleanup release tags.

[SVN r44252]
This commit was manufactured by cvs2svn to create tag
2026-04-13 13:15:50 +02:00 · 2008-04-12 03:40:20 +00:00 · 2003-08-04 17:55:29 +00:00 · 2003-03-05 16:26:01 +00:00 · 2003-03-01 19:43:06 +00:00
52 changed files with 835 additions and 4715 deletions
--- a/bind.html
+++ b/bind.html
@@ -7,9 +7,9 @@
 	<body style="MARGIN-LEFT: 5%; MARGIN-RIGHT: 5%" bgColor="white">
 		<table width="100%" border="0">
 			<tr>
-				<td width="277"><A href="../../index.htm"><IMG height="86" alt="boost.png (6897 bytes)" src="../../boost.png" width="277" border="0"></A>
+				<td width="277"><IMG height="86" alt="c++boost.gif (8819 bytes)" src="../../c++boost.gif" width="277">
 				</td>
-				<td align="center">
+				<td align="middle">
 					<h1>bind.hpp</h1>
 				</td>
 			</tr>
@@ -27,7 +27,6 @@
 				to members</A></h4>
 		<h4 style="MARGIN-LEFT: 40pt"><A href="#nested_binds">Using nested binds for function 
 				composition</A></h4>
-		<h4 style="MARGIN-LEFT: 40pt"><A href="#operators">Overloaded operators</A></h4>
 		<h3 style="MARGIN-LEFT: 20pt"><A href="#Examples">Examples</A></h3>
 		<h4 style="MARGIN-LEFT: 40pt"><A href="#with_algorithms">Using bind with standard 
 				algorithms</A></h4>
@@ -77,8 +76,8 @@
 		<h4 style="MARGIN-LEFT: 40pt"><A href="#Files">Files</A></h4>
 		<h4 style="MARGIN-LEFT: 40pt"><A href="#Dependencies">Dependencies</A></h4>
 		<h4 style="MARGIN-LEFT: 40pt"><A href="#NumberOfArguments">Number of Arguments</A></h4>
-		<h4 style="MARGIN-LEFT: 40pt"><A href="#stdcall">"__stdcall", "__cdecl", "__fastcall", 
-				and "pascal" Support</A></h4>
+		<h4 style="MARGIN-LEFT: 40pt"><A href="#stdcall">"__stdcall", "__fastcall", and 
+				"pascal" Support</A></h4>
 		<h4 style="MARGIN-LEFT: 40pt"><A href="#visit_each"><b>visit_each</b> support</A></h4>
 		<h3 style="MARGIN-LEFT: 20pt"><A href="#Acknowledgements">Acknowledgements</A></h3>
 		<h2><a name="Purpose">Purpose</a></h2>
@@ -152,8 +151,6 @@ bind(f, i, _1);
 		<pre>int i = 5;

 bind(f, ref(i), _1);
-
-bind(f, cref(42), _1);
 </pre>
 		<h3><a name="with_function_objects">Using bind with function objects</a></h3>
 		<p><b>bind</b> is not limited to functions; it accepts arbitrary function objects. 
@@ -195,14 +192,14 @@ bind(std::less&lt;int&gt;(), _1, 9)(x);	// x &lt; 9
 				boost::mem_fn</A> has been used to convert the member pointer into a 
 			function object. In other words, the expression
 		</p>
-		<pre>bind(&amp;X::f, <i>args</i>)
+		<pre>bind(&amp;X::f, <i>args</I>)
 </pre>
 		<p>is equivalent to
 		</p>
-		<pre>bind&lt;R&gt;(<A href="mem_fn.html" >mem_fn</A>(&amp;X::f), <i>args</i>)
+		<pre>bind&lt;R&gt;(<A href="mem_fn.html" >mem_fn</A>(&amp;X::f), <i>args</I>)
 </pre>
-		<p>where <b>R</b> is the return type of <b>X::f</b> (for member functions) or the 
-			type of the member (for data members.)
+		<p>where <b>R</b> is the return type of <b>X::f</b> (for member functions) or a 
+			const reference to the type of the member (for data members.)
 		</p>
 		<p>[Note: <b>mem_fn</b> creates function objects that are able to accept a pointer, 
 			a reference, or a smart pointer to an object as its first argument; for 
@@ -223,8 +220,8 @@ int i = 5;

 bind(&amp;X::f, ref(x), _1)(i);		// x.f(i)
 bind(&amp;X::f, &amp;x, _1)(i);			//(&amp;x)-&gt;f(i)
-bind(&amp;X::f, x, _1)(i);			// (<i>internal copy of x</i>).f(i)
-bind(&amp;X::f, p, _1)(i);			// (<i>internal copy of p</i>)-&gt;f(i)
+bind(&amp;X::f, x, _1)(i);			// (<i>internal copy of x</I>).f(i)
+bind(&amp;X::f, p, _1)(i);			// (<i>internal copy of p</I>)-&gt;f(i)
 </pre>
 		<p>The last two examples are interesting in that they produce "self-contained" 
 			function objects. <tt>bind(&amp;X::f, x, _1)</tt> stores a copy of <b>x</b>. <tt>bind(&amp;X::f, 
@@ -273,38 +270,15 @@ std::vector&lt;pf&gt; v;

 std::for_each(v.begin(), v.end(), bind(apply&lt;void&gt;(), _1, 5));
 </pre>
-		<P>Although the first argument is, by default, not evaluated, all other arguments 
-			are. Sometimes it is necessary not to evaluate arguments subsequent to the 
-			first, even when they are nested <STRONG>bind</STRONG> subexpressions. This can 
-			be achieved with the help of another function object, <STRONG>protect</STRONG>, 
-			that masks the type so that <STRONG>bind</STRONG> does not recognize and 
-			evaluate it. When called, <STRONG>protect</STRONG> simply forwards the argument 
-			list to the other function object unmodified.</P>
+		<P>Sometimes it is necessary not to evaluate the first argument, but <STRONG>not</STRONG>
+			to evaluate some of the other arguments, even when they are nested <STRONG>bind</STRONG>
+			subexpressions. This can be achieved with the help of another function object, <STRONG>
+				protect</STRONG>, that masks the type so that <STRONG>bind</STRONG> does 
+			not recognize and evaluate it. When called, <STRONG>protect</STRONG> simply 
+			forwards the argument list to the other function object unmodified.</P>
 		<P>The header <STRONG>boost/bind/protect.hpp</STRONG> contains an implementation of <STRONG>
 				protect</STRONG>. To protect a <STRONG>bind</STRONG> function object from 
 			evaluation, use <tt>protect(bind(f, ...))</tt>.</P>
-		<h3><a name="operators">Overloaded operators</a> (new in Boost 1.33)</h3>
-		<p>For convenience, the function objects produced by <tt>bind</tt> overload the 
-			logical not operator <STRONG>!</STRONG> and the relational operators <STRONG>==</STRONG>,
-			<STRONG>!=</STRONG>, <STRONG>&lt;</STRONG>, <STRONG>&lt;=</STRONG>, <STRONG>&gt;</STRONG>,
-			<STRONG>&gt;=</STRONG>.</p>
-		<P><tt>!bind(f, ...)</tt> is equivalent to <tt>bind( <EM>logical_not</EM>(), bind(f, 
-				...) )</tt>, where <tt><EM>logical_not</EM></tt> is a function object that 
-			takes one argument <tt>x</tt> and returns <tt>!x</tt>.</P>
-		<P><tt>bind(f, ...) <EM>op</EM> x</tt>, where <EM>op</EM> is a relational operator, 
-			is equivalent to <tt>bind( <EM>relation</EM>(), bind(f, ...), x )</tt>, where <em>relation</em>
-			is a function object that takes two arguments <tt>a</tt> and <tt>b</tt> and 
-			returns <tt>a <EM>op</EM> b</tt>.</P>
-		<P>What this means in practice is that you can conveniently negate the result of <tt>bind</tt>:</P>
-		<P><tt>std::remove_if( first, last, !bind( &amp;X::visible, _1 ) ); // remove invisible 
-				objects</tt></P>
-		<P>and compare the result of <tt>bind</tt> against a value:</P>
-		<P><tt>std::find_if( first, last, bind( &amp;X::name, _1 ) == "peter" );</tt></P>
-		<P>against a placeholder:</P>
-		<P><tt>bind( &amp;X::name, _1 ) == _2</tt></P>
-		<P>or against another <tt>bind</tt> expression:</P>
-		<P><tt>std::sort( first, last, bind( &amp;X::name, _1 ) &lt; bind( &amp;X::name, _2 ) 
-				); // sort by name</tt></P>
 		<h2><a name="Examples">Examples</a></h2>
 		<h3><a name="with_algorithms">Using bind with standard algorithms</a></h3>
 		<pre>class image;
@@ -382,8 +356,8 @@ template&lt;class T&gt; void f(T const &amp; t);
 			(b) does not actually work for const arguments, both l- and r-values, since the 
 			two templates produce the exact same signature and cannot be partially ordered.
 		</p>
-		<p>[Note: this is a dark corner of the language, and the <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#214">
-				corresponding issue</a> has only recently been resolved.]
+		<p>[Note: this is a dark corner of the language, and the <a href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_active.html#214">
+				corresponding issue</a> has not been resolved yet.]
 		</p>
 		<h2><a name="FAQ">Frequently Asked Questions</a></h2>
 		<h3><a name="Q_doesnt_compile">Why doesn't this compile?</a></h3>
@@ -462,7 +436,7 @@ int main()
 int main()
 {
    boost::bind(&amp;X::f, 1);     // error, X::f takes two arguments
-    boost::bind(&amp;X::f, <b>_1</b>, 1); // OK
+    boost::bind(&amp;X::f, <b>_1</B>, 1); // OK
 }
 </pre>
 		<h3><a name="err_signature">The function object cannot be called with the specified 
@@ -578,37 +552,37 @@ int main()

 // no arguments

-template&lt;class R, class F&gt; <i>unspecified-1</i> <A href="#bind_1" >bind</A>(F f);
+template&lt;class R, class F&gt; <i>unspecified-1</I> <A href="#bind_1" >bind</A>(F f);

-template&lt;class F&gt; <i>unspecified-1-1</i> <A href="#bind_1_1" >bind</A>(F f);
+template&lt;class F&gt; <i>unspecified-1-1</I> <A href="#bind_1_1" >bind</A>(F f);

-template&lt;class R&gt; <i>unspecified-2</i> <A href="#bind_2" >bind</A>(R (*f) ());
+template&lt;class R&gt; <i>unspecified-2</I> <A href="#bind_2" >bind</A>(R (*f) ());

 // one argument

-template&lt;class R, class F, class A1&gt; <i>unspecified-3</i> <A href="#bind_3" >bind</A>(F f, A1 a1);
+template&lt;class R, class F, class A1&gt; <i>unspecified-3</I> <A href="#bind_3" >bind</A>(F f, A1 a1);

-template&lt;class F, class A1&gt; <i>unspecified-3-1</i> <A href="#bind_3_1" >bind</A>(F f, A1 a1);
+template&lt;class F, class A1&gt; <i>unspecified-3-1</I> <A href="#bind_3_1" >bind</A>(F f, A1 a1);

-template&lt;class R, class B1, class A1&gt; <i>unspecified-4</i> <A href="#bind_4" >bind</A>(R (*f) (B1), A1 a1);
+template&lt;class R, class B1, class A1&gt; <i>unspecified-4</I> <A href="#bind_4" >bind</A>(R (*f) (B1), A1 a1);

-template&lt;class R, class T, class A1&gt; <i>unspecified-5</i> <A href="#bind_5" >bind</A>(R (T::*f) (), A1 a1);
+template&lt;class R, class T, class A1&gt; <i>unspecified-5</I> <A href="#bind_5" >bind</A>(R (T::*f) (), A1 a1);

-template&lt;class R, class T, class A1&gt; <i>unspecified-6</i> <A href="#bind_6" >bind</A>(R (T::*f) () const, A1 a1);
+template&lt;class R, class T, class A1&gt; <i>unspecified-6</I> <A href="#bind_6" >bind</A>(R (T::*f) () const, A1 a1);

-template&lt;class R, class T, class A1&gt; <i>unspecified-6-1</i> <A href="#bind_6_1" >bind</A>(R T::*f, A1 a1);
+template&lt;class R, class T, class A1&gt; <i>unspecified-6-1</I> <A href="#bind_6_1" >bind</A>(R T::*f, A1 a1);

 // two arguments

-template&lt;class R, class F, class A1, class A2&gt; <i>unspecified-7</i> <A href="#bind_7" >bind</A>(F f, A1 a1, A2 a2);
+template&lt;class R, class F, class A1, class A2&gt; <i>unspecified-7</I> <A href="#bind_7" >bind</A>(F f, A1 a1, A2 a2);

-template&lt;class F, class A1, class A2&gt; <i>unspecified-7-1</i> <A href="#bind_7_1" >bind</A>(F f, A1 a1, A2 a2);
+template&lt;class F, class A1, class A2&gt; <i>unspecified-7-1</I> <A href="#bind_7_1" >bind</A>(F f, A1 a1, A2 a2);

-template&lt;class R, class B1, class B2, class A1, class A2&gt; <i>unspecified-8</i> <A href="#bind_8" >bind</A>(R (*f) (B1, B2), A1 a1, A2 a2);
+template&lt;class R, class B1, class B2, class A1, class A2&gt; <i>unspecified-8</I> <A href="#bind_8" >bind</A>(R (*f) (B1, B2), A1 a1, A2 a2);

-template&lt;class R, class T, class B1, class A1, class A2&gt; <i>unspecified-9</i> <A href="#bind_9" >bind</A>(R (T::*f) (B1), A1 a1, A2 a2);
+template&lt;class R, class T, class B1, class A1, class A2&gt; <i>unspecified-9</I> <A href="#bind_9" >bind</A>(R (T::*f) (B1), A1 a1, A2 a2);

-template&lt;class R, class T, class B1, class A1, class A2&gt; <i>unspecified-10</i> <A href="#bind_10" >bind</A>(R (T::*f) (B1) const, A1 a1, A2 a2);
+template&lt;class R, class T, class B1, class A1, class A2&gt; <i>unspecified-10</I> <A href="#bind_10" >bind</A>(R (T::*f) (B1) const, A1 a1, A2 a2);

 // implementation defined number of additional overloads for more arguments

@@ -617,11 +591,11 @@ template&lt;class R, class T, class B1, class A1, class A2&gt; <i>unspecified-10
 namespace
 {

-<i>unspecified-placeholder-type-1</i> _1;
+<i>unspecified-placeholder-type-1</I> _1;

-<i>unspecified-placeholder-type-2</i> _2;
+<i>unspecified-placeholder-type-2</I> _2;

-<i>unspecified-placeholder-type-3</i> _3;
+<i>unspecified-placeholder-type-3</I> _3;

 // implementation defined number of additional placeholder definitions

@@ -709,7 +683,7 @@ namespace
 		<h4><a name="bind_6_1">template&lt;class R, class T, class A1&gt; <i>unspecified-6-1</i>
 				bind(R T::*f, A1 a1)</a></h4>
 		<blockquote>
-			<p><b>Effects:</b> Equivalent to <tt>bind&lt;R&gt;(<A href="mem_fn.html">boost::mem_fn</A>(f), 
+			<p><b>Effects:</b> Equivalent to <tt>bind&lt;R const &amp;&gt;(<A href="mem_fn.html">boost::mem_fn</A>(f), 
 					a1);</tt></p>
 		</blockquote>
 		<h4><a name="bind_7">template&lt;class R, class F, class A1, class A2&gt; <i>unspecified-7</i>
@@ -810,18 +784,18 @@ namespace
 		<h3><a name="Dependencies">Dependencies</a></h3>
 		<ul>
 			<li>
-				<A href="../config/config.htm">Boost.Config</A>
+				<A href="../config/config.htm">Boost.Config</A></li>
 			<li>
-				<A href="ref.html">boost/ref.hpp</A>
+				<A href="ref.html">boost/ref.hpp</A></li>
 			<li>
-				<A href="mem_fn.html">boost/mem_fn.hpp</A>
+				<A href="mem_fn.html">boost/mem_fn.hpp</A></li>
 			<li>
 				<A href="../../boost/type.hpp">boost/type.hpp</A></li>
 		</ul>
 		<h3><a name="NumberOfArguments">Number of Arguments</a></h3>
 		<p>This implementation supports function objects with up to nine arguments. This is 
 			an implementation detail, not an inherent limitation of the design.</p>
-		<h3><a name="stdcall">"__stdcall", "__cdecl", "__fastcall", and "pascal" Support</a></h3>
+		<h3><a name="stdcall">"__stdcall", "__fastcall", and "pascal" Support</a></h3>
 		<p>Some platforms allow several types of (member) functions that differ by their <b>calling 
 				convention</b> (the rules by which the function is invoked: how are 
 			arguments passed, how is the return value handled, and who cleans up the stack 
@@ -839,12 +813,6 @@ namespace
 			the macro <B>BOOST_MEM_FN_ENABLE_FASTCALL</B> before including <B>&lt;boost/bind.hpp&gt;</B>.</P>
 		<P>To use <b>bind</b> with <b>pascal</b> functions, <b>#define</b> the macro <b>BOOST_BIND_ENABLE_PASCAL</b>
 			before including <b>&lt;boost/bind.hpp&gt;</b>.</P>
-		<P>To use <B>bind</B> with <B>__cdecl</B> <B>member</B> functions, <B>#define</B> the 
-			macro <B>BOOST_MEM_FN_ENABLE_CDECL</B> before including <B>&lt;boost/bind.hpp&gt;</B>.</P>
-		<P><STRONG>It is best to define these macros in the project options, via -D on the 
-				command line, or as the first line in the translation unit (.cpp file) where 
-				bind is used.</STRONG> Not following this rule can lead to obscure errors 
-			when a header includes bind.hpp before the macro has been defined.</P>
 		<p>[Note: this is a non-portable extension. It is not part of the interface.]</p>
 		<p>[Note: Some compilers provide only minimal support for the <b>__stdcall</b> keyword.]</p>
 		<h3><a name="visit_each"><b>visit_each</b> support</a></h3>
@@ -858,15 +826,14 @@ namespace
 				The <a href="http://staff.cs.utu.fi/BL/">Binder Library</a>
 			by Jaakko Järvi;
 			<li>
-				The <a href="../lambda/index.html">Lambda Library</a>
-			(now part of Boost) by Jaakko Järvi and Gary Powell (the successor to the
-			Binder Library);
+				The <a href="../lambda/">Lambda Library</a> (now part of Boost)
+			by Jaakko Järvi and Gary Powell (the successor to the Binder Library);
 			<li>
-				<a href="http://more.sourceforge.net/">Extensions to the STL</a> by Petter 
-				Urkedal.</li></ul>
+				<a href="http://matfys.lth.se/~petter/src/more/stlext/index.html">Extensions to the 
+					STL</a> by Petter Urkedal.</li></ul>
 		<p>Doug Gregor suggested that a visitor mechanism would allow <b>bind</b> to 
 			interoperate with a signal/slot library.</p>
-		<p>John Maddock fixed a MSVC-specific conflict between <b>bind</b> and the <A href="../type_traits/index.html">
+		<p>John Maddock fixed a MSVC-specific conflict between <b>bind</b> and the <A href="../type_traits/index.htm">
 				type traits library</A>.</p>
 		<p>Numerous improvements were suggested during the formal review period by Ross 
 			Smith, Richard Crossley, Jens Maurer, Ed Brey, and others. Review manager was 
@@ -889,9 +856,10 @@ namespace
 		<p><br>
 			<br>
 			<br>
-			<small>Copyright © 2001, 2002 by Peter Dimov and Multi Media Ltd. Copyright 
-				2003-2005 Peter Dimov. 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>.</small></p>
+			<small>Copyright © 2001, 2002 by Peter Dimov and Multi Media 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.</small></p>
 	</body>
 </html>
--- a/bind_as_compose.cpp
+++ b/bind_as_compose.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -14,9 +12,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #include <boost/bind.hpp>
--- a/bind_visitor.cpp
+++ b/bind_visitor.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #include <boost/bind.hpp>
--- a/doc/ref.xml
+++ b/doc/ref.xml
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
-  "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<library name="Ref" dirname="ref" id="ref" last-revision="$Date$">
-  <libraryinfo>
-    <author>
-      <firstname>Jaakko</firstname>
-      <surname>J&auml;rvi</surname>
-    </author>
-    <author>
-      <firstname>Peter</firstname>
-      <surname>Dimov</surname>
-    </author>
-    <author>
-      <firstname>Douglas</firstname>
-      <surname>Gregor</surname>
-    </author>
-    <author>
-      <firstname>Dave</firstname>
-      <surname>Abrahams</surname>
-    </author>
-
-    <copyright>
-      <year>1999</year>
-      <year>2000</year>
-      <holder>Jaakko J&auml;rvi</holder>
-    </copyright>
-
-    <copyright>
-      <year>2001</year>
-      <year>2002</year>
-      <holder>Peter Dimov</holder>
-    </copyright>
-    
-    <copyright>
-      <year>2002</year>
-      <holder>David Abrahams</holder>
-    </copyright>
-
-    <legalnotice>
-      <para>Subject to the Boost Software License, Version 1.0. See 
-      accompanying file <filename>LICENSE_1_0.txt</filename> or copy at
-      <ulink url="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</ulink>.
-      </para>
-    </legalnotice>
-
-    <librarypurpose>A utility library for passing references to generic functions</librarypurpose>
-    <librarycategory name="category:higher-order"/>
-  </libraryinfo>
-
-<title>Boost.Ref</title>
-
-<section id="ref.intro">
-  <title>Introduction</title> 
-
-  <using-namespace name="boost"/>
-
-  <para>The Ref library is a small library that is useful for passing
-  references to function templates (algorithms) that would usually
-  take copies of their arguments. It defines the class template
-  <code><classname>boost::reference_wrapper&lt;T&gt;</classname></code>,
-  the two functions
-  <code><functionname>boost::ref</functionname></code> and
-  <code><functionname>boost::cref</functionname></code> that return
-  instances of <code>boost::reference_wrapper&lt;T&gt;</code>, and the
-  two traits classes
-  <code><classname>boost::is_reference_wrapper&lt;T&gt;</classname></code>
-  and
-  <code><classname>boost::unwrap_reference&lt;T&gt;</classname></code>.</para>
-
-  <para>The purpose of
-  <code>boost::reference_wrapper&lt;T&gt;</code> is to
-  contain a reference to an object of type T. It is primarily used to
-  "feed" references to function templates (algorithms) that take their
-  parameter by value.</para>
-
-  <para>To support this usage,
-  <code>boost::reference_wrapper&lt;T&gt;</code> provides an implicit
-  conversion to <code>T&amp;</code>. This usually allows the function
-  templates to work on references unmodified.</para>
-
-  <para><code>boost::reference_wrapper&lt;T&gt;</code> is
-  both CopyConstructible and Assignable (ordinary references are not
-  Assignable).</para>
-
-  <para>The expression <code>boost::ref(x)</code>
-  returns a
-  <code>boost::reference_wrapper&lt;X&gt;(x)</code> where X
-  is the type of x. Similarly,
-  <code>boost::cref(x)</code> returns a
-  <code>boost::reference_wrapper&lt;X const&gt;(x)</code>.</para>
-
-  <para>The expression
-  <code>boost::is_reference_wrapper&lt;T&gt;::value</code>
-  is true if T is a <code>reference_wrapper</code>, and
-  false otherwise.</para>
-
-  <para>The type-expression
-  <code>boost::unwrap_reference&lt;T&gt;::type</code> is T::type if T
-  is a <code>reference_wrapper</code>, T otherwise.</para>
-</section>
-
-<library-reference>
-<header name="boost/ref.hpp">
-  <namespace name="boost">
-    <class name="reference_wrapper">
-      <template>
-        <template-type-parameter name="T"/>
-      </template>
-      <purpose>
-        Contains a reference to an object of type
-        <computeroutput>T</computeroutput>. 
-      </purpose>
-
-      <description>
-        <para><computeroutput><classname>reference_wrapper</classname></computeroutput>
-        is primarily used to "feed" references to function templates
-        (algorithms) that take their parameter by value.  It provides
-        an implicit conversion to
-        <computeroutput>T&amp;</computeroutput>, which usually allows
-        the function templates to work on references
-        unmodified.</para>
-      </description>
-
-      <typedef name="type"><type>T</type></typedef>
-
-      <constructor specifiers="explicit">
-        <parameter name="t">
-          <paramtype>T&amp;</paramtype>
-        </parameter>
-
-        <effects><simpara>Constructs a
-        <computeroutput><classname>reference_wrapper</classname></computeroutput>
-        object that stores a reference to
-        <computeroutput>t</computeroutput>.</simpara></effects>
-
-        <throws><simpara>Does not throw.</simpara></throws>
-      </constructor>    
-
-      <method-group name="access">
-        <method name="conversion-operator" cv="const">
-          <type>T&amp;</type>
-          <returns><simpara>The stored reference.</simpara></returns>
-          <throws><simpara>Does not throw.</simpara></throws>
-        </method>
-
-        <method name="get" cv="const">
-          <type>T&amp;</type>
-          <returns><simpara>The stored reference.</simpara></returns>
-          <throws><simpara>Does not throw.</simpara></throws>
-        </method>
-
-        <method name="get_pointer" cv="const">
-          <type>T*</type>
-          <returns><simpara>A pointer to the object referenced by the stored reference.</simpara></returns>
-          <throws><simpara>Does not throw.</simpara></throws>
-        </method>
-      </method-group>
-
-      <free-function-group name="constructors">
-        <function name="ref">
-          <type>reference_wrapper&lt;T&gt;</type>
-          <parameter name="t">
-            <paramtype>T&amp;</paramtype>
-          </parameter>
-
-          <returns><simpara><computeroutput><classname>reference_wrapper</classname>&lt;T&gt;(t)</computeroutput></simpara></returns>
-
-          <throws><simpara>Does not throw.</simpara></throws>
-        </function>
-
-        <function name="cref">
-          <type>reference_wrapper&lt;T const&gt;</type>
-          <parameter name="t">
-            <paramtype>T const&amp;</paramtype>
-          </parameter>
-
-          <returns><simpara><computeroutput><classname>reference_wrapper</classname>&lt;T const&gt;(t)</computeroutput></simpara></returns>
-
-          <throws><simpara>Does not throw.</simpara></throws>
-        </function>
-      </free-function-group>
-    </class>
-
-    <class name="is_reference_wrapper">
-      <template>
-        <template-type-parameter name="T"/>
-      </template>
-
-      <purpose>Determine if a type <computeroutput>T</computeroutput> is an instantiation of <computeroutput><classname>reference_wrapper</classname></computeroutput>.</purpose>
-
-      <description>
-        <para>The <computeroutput>value</computeroutput> static
-        constant will be <computeroutput>true</computeroutput> iff the
-        type <computeroutput>T</computeroutput> is a specialization of
-        <computeroutput><classname>reference_wrapper</classname></computeroutput>.</para>
-      </description>
-
-      <static-constant name="value">
-        <type>bool</type>
-        <default><emphasis>unspecified</emphasis></default>
-      </static-constant>
-    </class>
-
-    <class name="unwrap_reference">
-      <template>
-        <template-type-parameter name="T"/>
-      </template>
-  
-      <purpose>Find the type in a <computeroutput><classname>reference_wrapper</classname></computeroutput>.</purpose>
-
-      <description>
-        <para>The typedef <computeroutput>type</computeroutput> is
-        <computeroutput>T::type</computeroutput> if
-        <computeroutput>T</computeroutput> is a
-        <computeroutput><classname>reference_wrapper</classname></computeroutput>,
-        <computeroutput>T</computeroutput> otherwise.</para>
-      </description>
-
-      <typedef name="type"><type><emphasis>unspecified</emphasis></type></typedef>
-    </class>
-  </namespace>
-</header>
-</library-reference>
-
-<section id="ref.ack">
-  <title>Acknowledgements</title>
-
-  <using-namespace name="boost"/> 
-
-  <para><functionname>ref</functionname> and <functionname>cref</functionname>
-  were originally part of the <libraryname>Tuple</libraryname> library
-  by Jaakko J&auml;rvi. They were "promoted to boost:: status" by
-  Peter Dimov because they are generally useful.  Douglas Gregor and
-  Dave Abrahams contributed
-  <classname>is_reference_wrapper</classname> and
-  <classname>unwrap_reference</classname>.</para>
-</section>
-
-</library>
--- a/include/boost/bind.hpp
+++ b/include/boost/bind.hpp
--- a/include/boost/bind/apply.hpp
+++ b/include/boost/bind/apply.hpp
@@ -4,11 +4,12 @@
 //
 //  apply.hpp
 //
-//  Copyright (c) 2002, 2003 Peter Dimov and Multi Media Ltd.
+//  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 namespace boost
@@ -18,52 +19,52 @@ template<class R> struct apply
 {
    typedef R result_type;

-    template<class F> result_type operator()(F & f) const
+    template<class F> result_type operator()(F f) const
    {
        return f();
    }

-    template<class F, class A1> result_type operator()(F & f, A1 & a1) const
+    template<class F, class A1> result_type operator()(F f, A1 & a1) const
    {
        return f(a1);
    }

-    template<class F, class A1, class A2> result_type operator()(F & f, A1 & a1, A2 & a2) const
+    template<class F, class A1, class A2> result_type operator()(F f, A1 & a1, A2 & a2) const
    {
        return f(a1, a2);
    }

-    template<class F, class A1, class A2, class A3> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3) const
+    template<class F, class A1, class A2, class A3> result_type operator()(F f, A1 & a1, A2 & a2, A3 & a3) const
    {
        return f(a1, a2, a3);
    }

-    template<class F, class A1, class A2, class A3, class A4> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4) const
+    template<class F, class A1, class A2, class A3, class A4> result_type operator()(F f, A1 & a1, A2 & a2, A3 & a3, A4 & a4) const
    {
        return f(a1, a2, a3, a4);
    }

-    template<class F, class A1, class A2, class A3, class A4, class A5> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5) const
+    template<class F, class A1, class A2, class A3, class A4, class A5> result_type operator()(F f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5) const
    {
        return f(a1, a2, a3, a4, a5);
    }

-    template<class F, class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6) const
+    template<class F, class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(F f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6) const
    {
        return f(a1, a2, a3, a4, a5, a6);
    }

-    template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7) const
+    template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(F f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7) const
    {
        return f(a1, a2, a3, a4, a5, a6, a7);
    }

-    template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8) const
+    template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(F f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8) const
    {
        return f(a1, a2, a3, a4, a5, a6, a7, a8);
    }

-    template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8, A9 & a9) const
+    template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(F f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8, A9 & a9) const
    {
        return f(a1, a2, a3, a4, a5, a6, a7, a8, a9);
    }
--- a/include/boost/bind/arg.hpp
+++ b/include/boost/bind/arg.hpp
@@ -1,10 +1,8 @@
 #ifndef BOOST_BIND_ARG_HPP_INCLUDED
 #define BOOST_BIND_ARG_HPP_INCLUDED

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

 //
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //
 //  See http://www.boost.org/libs/bind/bind.html for documentation.
 //
@@ -26,11 +25,6 @@ template<int I> class arg
 {
 };

-template<int I> bool operator==(arg<I> const &, arg<I> const &)
-{
-    return true;
-}
-
 } // namespace boost

 #endif // #ifndef BOOST_BIND_ARG_HPP_INCLUDED
--- a/include/boost/bind/bind_cc.hpp
+++ b/include/boost/bind/bind_cc.hpp
@@ -5,9 +5,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //
 //  See http://www.boost.org/libs/bind/bind.html for documentation.
 //
--- a/include/boost/bind/bind_mf_cc.hpp
+++ b/include/boost/bind/bind_mf_cc.hpp
@@ -5,9 +5,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //
 //  See http://www.boost.org/libs/bind/bind.html for documentation.
 //
--- a/include/boost/bind/bind_template.hpp
+++ b/include/boost/bind/bind_template.hpp
@@ -3,11 +3,12 @@
 //
 //  Do not include this header directly.
 //
-//  Copyright (c) 2001-2004 Peter Dimov and Multi Media Ltd.
+//  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //
 //  See http://www.boost.org/libs/bind/bind.html for documentation.
 //
@@ -17,209 +18,139 @@
    result_type operator()()
    {
        list0 a;
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    result_type operator()() const
    {
        list0 a;
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1> result_type operator()(A1 & a1)
    {
        list1<A1 &> a(a1);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1> result_type operator()(A1 & a1) const
    {
        list1<A1 &> a(a1);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1> result_type operator()(A1 const & a1)
-    {
-        list1<A1 const &> a(a1);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1> result_type operator()(A1 const & a1) const
-    {
-        list1<A1 const &> a(a1);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
    template<class A1, class A2> result_type operator()(A1 & a1, A2 & a2)
    {
        list2<A1 &, A2 &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2> result_type operator()(A1 & a1, A2 & a2) const
    {
        list2<A1 &, A2 &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 & a2)
-    {
-        list2<A1 const &, A2 &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 & a2) const
-    {
-        list2<A1 const &, A2 &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-
-    template<class A1, class A2> result_type operator()(A1 & a1, A2 const & a2)
-    {
-        list2<A1 &, A2 const &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 & a1, A2 const & a2) const
-    {
-        list2<A1 &, A2 const &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 const & a2)
-    {
-        list2<A1 const &, A2 const &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 const & a2) const
-    {
-        list2<A1 const &, A2 const &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
    template<class A1, class A2, class A3> result_type operator()(A1 & a1, A2 & a2, A3 & a3)
    {
        list3<A1 &, A2 &, A3 &> a(a1, a2, a3);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3> result_type operator()(A1 & a1, A2 & a2, A3 & a3) const
    {
        list3<A1 &, A2 &, A3 &> a(a1, a2, a3);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4)
    {
        list4<A1 &, A2 &, A3 &, A4 &> a(a1, a2, a3, a4);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4) const
    {
        list4<A1 &, A2 &, A3 &, A4 &> a(a1, a2, a3, a4);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4, class A5> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5)
    {
        list5<A1 &, A2 &, A3 &, A4 &, A5 &> a(a1, a2, a3, a4, a5);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4, class A5> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5) const
    {
        list5<A1 &, A2 &, A3 &, A4 &, A5 &> a(a1, a2, a3, a4, a5);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6)
    {
        list6<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &> a(a1, a2, a3, a4, a5, a6);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6) const
    {
        list6<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &> a(a1, a2, a3, a4, a5, a6);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7)
    {
        list7<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &> a(a1, a2, a3, a4, a5, a6, a7);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7) const
    {
        list7<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &> a(a1, a2, a3, a4, a5, a6, a7);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8)
    {
        list8<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &, A8 &> a(a1, a2, a3, a4, a5, a6, a7, a8);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8) const
    {
        list8<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &, A8 &> a(a1, a2, a3, a4, a5, a6, a7, a8);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8, A9 & a9)
    {
        list9<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &, A8 &, A9 &> a(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8, A9 & a9) const
    {
        list9<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &, A8 &, A9 &> a(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A> result_type eval(A & a)
    {
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class A> result_type eval(A & a) const
    {
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
+        BOOST_BIND_EVALUATE;
    }

    template<class V> void accept(V & v) const
    {
-#if !defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) && !defined( __BORLANDC__ )
-
-        using boost::visit_each;
-
-#endif
        BOOST_BIND_VISIT_EACH(v, f_, 0);
        l_.accept(v);
    }

-    bool compare(this_type const & rhs) const
-    {
-        return ref_compare(f_, rhs.f_, 0) && l_ == rhs.l_;
-    }
-
 private:

    F f_;
--- a/include/boost/bind/make_adaptable.hpp
+++ b/include/boost/bind/make_adaptable.hpp
@@ -6,9 +6,10 @@
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 namespace boost
@@ -17,6 +18,10 @@ namespace boost
 namespace _bi
 {

+template<class F> void instantiate(F)
+{
+}
+
 template<class R, class F> class af0
 {
 public:
@@ -32,11 +37,6 @@ public:
        return f_();
    }

-    result_type operator()() const
-    {
-        return f_();
-    }
-
 private:

    F f_;
@@ -59,11 +59,6 @@ public:
        return f_(a1);
    }

-    result_type operator()(A1 a1) const
-    {
-        return f_(a1);
-    }
-
 private:

    F f_;
@@ -88,11 +83,6 @@ public:
        return f_(a1, a2);
    }

-    result_type operator()(A1 a1, A2 a2) const
-    {
-        return f_(a1, a2);
-    }
-
 private:

    F f_;
@@ -116,11 +106,6 @@ public:
        return f_(a1, a2, a3);
    }

-    result_type operator()(A1 a1, A2 a2, A3 a3) const
-    {
-        return f_(a1, a2, a3);
-    }
-
 private:

    F f_;
@@ -145,11 +130,6 @@ public:
        return f_(a1, a2, a3, a4);
    }

-    result_type operator()(A1 a1, A2 a2, A3 a3, A4 a4) const
-    {
-        return f_(a1, a2, a3, a4);
-    }
-
 private:

    F f_;
@@ -159,26 +139,31 @@ private:

 template<class R, class F> _bi::af0<R, F> make_adaptable(F f)
 {
+    _bi::instantiate( &_bi::af0<R, F>::operator() ); // for early error detection
    return _bi::af0<R, F>(f);
 }

 template<class R, class A1, class F> _bi::af1<R, A1, F> make_adaptable(F f)
 {
+    instantiate( &_bi::af1<R, A1, F>::operator() );
    return _bi::af1<R, A1, F>(f);
 }

 template<class R, class A1, class A2, class F> _bi::af2<R, A1, A2, F> make_adaptable(F f)
 {
+    instantiate( &_bi::af2<R, A1, A2, F>::operator() );
    return _bi::af2<R, A1, A2, F>(f);
 }

 template<class R, class A1, class A2, class A3, class F> _bi::af3<R, A1, A2, A3, F> make_adaptable(F f)
 {
+    instantiate( &_bi::af3<R, A1, A2, A3, F>::operator() );
    return _bi::af3<R, A1, A2, A3, F>(f);
 }

 template<class R, class A1, class A2, class A3, class A4, class F> _bi::af4<R, A1, A2, A3, A4, F> make_adaptable(F f)
 {
+    instantiate( &_bi::af4<R, A1, A2, A3, A4, F>::operator() );
    return _bi::af4<R, A1, A2, A3, A4, F>(f);
 }

--- a/include/boost/bind/mem_fn_cc.hpp
+++ b/include/boost/bind/mem_fn_cc.hpp
@@ -5,9 +5,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //
 //  See http://www.boost.org/libs/bind/mem_fn.html for documentation.
 //
--- a/include/boost/bind/mem_fn_template.hpp
+++ b/include/boost/bind/mem_fn_template.hpp
@@ -5,17 +5,14 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //
 //  See http://www.boost.org/libs/bind/mem_fn.html for documentation.
 //

-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-# define BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-#endif
-
 // mf0

 template<class R, class T BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(mf0)
@@ -54,29 +51,10 @@ public:
        BOOST_MEM_FN_RETURN call(u, &u);
    }

-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u) const
-    {
-        BOOST_MEM_FN_RETURN call(u, &u);
-    }
-
-#endif
-
    R operator()(T & t) const
    {
        BOOST_MEM_FN_RETURN (t.*f_)();
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf0) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf0) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // cmf0
@@ -116,16 +94,6 @@ public:
    {
        BOOST_MEM_FN_RETURN (t.*f_)();
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf0) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf0) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // mf1
@@ -167,29 +135,10 @@ public:
        BOOST_MEM_FN_RETURN call(u, &u, a1);
    }

-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1) const
-    {
-        BOOST_MEM_FN_RETURN call(u, &u, a1);
-    }
-
-#endif
-
    R operator()(T & t, A1 a1) const
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf1) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf1) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // cmf1
@@ -230,16 +179,6 @@ public:
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf1) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf1) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // mf2
@@ -279,29 +218,10 @@ public:
        BOOST_MEM_FN_RETURN call(u, &u, a1, a2);
    }

-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2) const
-    {
-        BOOST_MEM_FN_RETURN call(u, &u, a1, a2);
-    }
-
-#endif
-
    R operator()(T & t, A1 a1, A2 a2) const
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf2) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf2) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // cmf2
@@ -340,16 +260,6 @@ public:
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf2) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf2) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // mf3
@@ -389,29 +299,10 @@ public:
        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3);
    }

-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3) const
-    {
-        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3);
-    }
-
-#endif
-
    R operator()(T & t, A1 a1, A2 a2, A3 a3) const
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf3) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf3) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // cmf3
@@ -450,16 +341,6 @@ public:
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf3) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf3) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // mf4
@@ -499,29 +380,10 @@ public:
        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3, a4);
    }

-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4) const
-    {
-        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3, a4);
-    }
-
-#endif
-
    R operator()(T & t, A1 a1, A2 a2, A3 a3, A4 a4) const
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf4) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf4) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // cmf4
@@ -560,16 +422,6 @@ public:
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf4) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf4) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // mf5
@@ -609,29 +461,10 @@ public:
        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3, a4, a5);
    }

-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) const
-    {
-        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3, a4, a5);
-    }
-
-#endif
-
    R operator()(T & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) const
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf5) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf5) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // cmf5
@@ -670,16 +503,6 @@ public:
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf5) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf5) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // mf6
@@ -719,29 +542,10 @@ public:
        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3, a4, a5, a6);
    }

-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) const
-    {
-        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3, a4, a5, a6);
-    }
-
-#endif
-
    R operator()(T & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) const
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf6) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf6) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // cmf6
@@ -780,16 +584,6 @@ public:
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf6) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf6) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // mf7
@@ -829,29 +623,10 @@ public:
        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3, a4, a5, a6, a7);
    }

-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) const
-    {
-        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3, a4, a5, a6, a7);
-    }
-
-#endif
-
    R operator()(T & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) const
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6, a7);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf7) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf7) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // cmf7
@@ -890,16 +665,6 @@ public:
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6, a7);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf7) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf7) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // mf8
@@ -939,29 +704,10 @@ public:
        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3, a4, a5, a6, a7, a8);
    }

-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
-    {
-        BOOST_MEM_FN_RETURN call(u, &u, a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-#endif
-
    R operator()(T & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6, a7, a8);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf8) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf8) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 // cmf8
@@ -1005,16 +751,5 @@ public:
    {
        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6, a7, a8);
    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf8) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf8) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

-#undef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
--- a/include/boost/bind/mem_fn_vw.hpp
+++ b/include/boost/bind/mem_fn_vw.hpp
@@ -5,9 +5,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //
 //  See http://www.boost.org/libs/bind/mem_fn.html for documentation.
 //
--- a/include/boost/bind/placeholders.hpp
+++ b/include/boost/bind/placeholders.hpp
@@ -1,10 +1,8 @@
 #ifndef BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
 #define BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED

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

 //
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //
 //  See http://www.boost.org/libs/bind/bind.html for documentation.
 //
@@ -25,7 +24,7 @@
 namespace
 {

-#if defined(__BORLANDC__) || defined(__GNUC__)
+#if defined(__BORLANDC__)

 static inline boost::arg<1> _1() { return boost::arg<1>(); }
 static inline boost::arg<2> _2() { return boost::arg<2>(); }
@@ -37,7 +36,7 @@ static inline boost::arg<7> _7() { return boost::arg<7>(); }
 static inline boost::arg<8> _8() { return boost::arg<8>(); }
 static inline boost::arg<9> _9() { return boost::arg<9>(); }

-#elif defined(BOOST_MSVC) || (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031) || defined(__MWERKS__)
+#elif (defined(BOOST_MSVC) && BOOST_MSVC <= 1300) || (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031) || defined(__MWERKS__)

 static boost::arg<1> _1;
 static boost::arg<2> _2;
--- a/include/boost/bind/protect.hpp
+++ b/include/boost/bind/protect.hpp
@@ -6,9 +6,10 @@
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 namespace boost
--- a/include/boost/bind/storage.hpp
+++ b/include/boost/bind/storage.hpp
@@ -1,475 +0,0 @@
-#ifndef BOOST_BIND_STORAGE_HPP_INCLUDED
-#define BOOST_BIND_STORAGE_HPP_INCLUDED
-
-// MS compatible compilers support #pragma once
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-//
-//  bind/storage.hpp
-//
-//  boost/bind.hpp support header, optimized storage
-//
-//  Copyright (c) 2006 Peter Dimov
-//
-//  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
-//
-//  See http://www.boost.org/libs/bind/bind.html for documentation.
-//
-
-#include <boost/config.hpp>
-#include <boost/bind/arg.hpp>
-
-#ifdef BOOST_MSVC
-# pragma warning(push)
-# pragma warning(disable: 4512) // assignment operator could not be generated
-#endif
-
-namespace boost
-{
-
-namespace _bi
-{
-
-// 1
-
-template<class A1> struct storage1
-{
-    explicit storage1( A1 a1 ): a1_( a1 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        BOOST_BIND_VISIT_EACH(v, a1_, 0);
-    }
-
-    A1 a1_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( __BORLANDC__ )
-
-template<int I> struct storage1< boost::arg<I> >
-{
-    explicit storage1( boost::arg<I> ) {}
-
-    template<class V> void accept(V &) const { }
-
-    static boost::arg<I> a1_() { return boost::arg<I>(); }
-};
-
-template<int I> struct storage1< boost::arg<I> (*) () >
-{
-    explicit storage1( boost::arg<I> (*) () ) {}
-
-    template<class V> void accept(V &) const { }
-
-    static boost::arg<I> a1_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 2
-
-template<class A1, class A2> struct storage2: public storage1<A1>
-{
-    typedef storage1<A1> inherited;
-
-    storage2( A1 a1, A2 a2 ): storage1<A1>( a1 ), a2_( a2 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a2_, 0);
-    }
-
-    A2 a2_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, int I> struct storage2< A1, boost::arg<I> >: public storage1<A1>
-{
-    typedef storage1<A1> inherited;
-
-    storage2( A1 a1, boost::arg<I> ): storage1<A1>( a1 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a2_() { return boost::arg<I>(); }
-};
-
-template<class A1, int I> struct storage2< A1, boost::arg<I> (*) () >: public storage1<A1>
-{
-    typedef storage1<A1> inherited;
-
-    storage2( A1 a1, boost::arg<I> (*) () ): storage1<A1>( a1 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a2_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 3
-
-template<class A1, class A2, class A3> struct storage3: public storage2< A1, A2 >
-{
-    typedef storage2<A1, A2> inherited;
-
-    storage3( A1 a1, A2 a2, A3 a3 ): storage2<A1, A2>( a1, a2 ), a3_( a3 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a3_, 0);
-    }
-
-    A3 a3_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, int I> struct storage3< A1, A2, boost::arg<I> >: public storage2< A1, A2 >
-{
-    typedef storage2<A1, A2> inherited;
-
-    storage3( A1 a1, A2 a2, boost::arg<I> ): storage2<A1, A2>( a1, a2 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a3_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, int I> struct storage3< A1, A2, boost::arg<I> (*) () >: public storage2< A1, A2 >
-{
-    typedef storage2<A1, A2> inherited;
-
-    storage3( A1 a1, A2 a2, boost::arg<I> (*) () ): storage2<A1, A2>( a1, a2 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a3_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 4
-
-template<class A1, class A2, class A3, class A4> struct storage4: public storage3< A1, A2, A3 >
-{
-    typedef storage3<A1, A2, A3> inherited;
-
-    storage4( A1 a1, A2 a2, A3 a3, A4 a4 ): storage3<A1, A2, A3>( a1, a2, a3 ), a4_( a4 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a4_, 0);
-    }
-
-    A4 a4_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, int I> struct storage4< A1, A2, A3, boost::arg<I> >: public storage3< A1, A2, A3 >
-{
-    typedef storage3<A1, A2, A3> inherited;
-
-    storage4( A1 a1, A2 a2, A3 a3, boost::arg<I> ): storage3<A1, A2, A3>( a1, a2, a3 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a4_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, int I> struct storage4< A1, A2, A3, boost::arg<I> (*) () >: public storage3< A1, A2, A3 >
-{
-    typedef storage3<A1, A2, A3> inherited;
-
-    storage4( A1 a1, A2 a2, A3 a3, boost::arg<I> (*) () ): storage3<A1, A2, A3>( a1, a2, a3 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a4_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 5
-
-template<class A1, class A2, class A3, class A4, class A5> struct storage5: public storage4< A1, A2, A3, A4 >
-{
-    typedef storage4<A1, A2, A3, A4> inherited;
-
-    storage5( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5 ): storage4<A1, A2, A3, A4>( a1, a2, a3, a4 ), a5_( a5 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a5_, 0);
-    }
-
-    A5 a5_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, class A4, int I> struct storage5< A1, A2, A3, A4, boost::arg<I> >: public storage4< A1, A2, A3, A4 >
-{
-    typedef storage4<A1, A2, A3, A4> inherited;
-
-    storage5( A1 a1, A2 a2, A3 a3, A4 a4, boost::arg<I> ): storage4<A1, A2, A3, A4>( a1, a2, a3, a4 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a5_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, class A4, int I> struct storage5< A1, A2, A3, A4, boost::arg<I> (*) () >: public storage4< A1, A2, A3, A4 >
-{
-    typedef storage4<A1, A2, A3, A4> inherited;
-
-    storage5( A1 a1, A2 a2, A3 a3, A4 a4, boost::arg<I> (*) () ): storage4<A1, A2, A3, A4>( a1, a2, a3, a4 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a5_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 6
-
-template<class A1, class A2, class A3, class A4, class A5, class A6> struct storage6: public storage5< A1, A2, A3, A4, A5 >
-{
-    typedef storage5<A1, A2, A3, A4, A5> inherited;
-
-    storage6( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6 ): storage5<A1, A2, A3, A4, A5>( a1, a2, a3, a4, a5 ), a6_( a6 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a6_, 0);
-    }
-
-    A6 a6_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, class A4, class A5, int I> struct storage6< A1, A2, A3, A4, A5, boost::arg<I> >: public storage5< A1, A2, A3, A4, A5 >
-{
-    typedef storage5<A1, A2, A3, A4, A5> inherited;
-
-    storage6( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, boost::arg<I> ): storage5<A1, A2, A3, A4, A5>( a1, a2, a3, a4, a5 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a6_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, int I> struct storage6< A1, A2, A3, A4, A5, boost::arg<I> (*) () >: public storage5< A1, A2, A3, A4, A5 >
-{
-    typedef storage5<A1, A2, A3, A4, A5> inherited;
-
-    storage6( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, boost::arg<I> (*) () ): storage5<A1, A2, A3, A4, A5>( a1, a2, a3, a4, a5 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a6_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 7
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> struct storage7: public storage6< A1, A2, A3, A4, A5, A6 >
-{
-    typedef storage6<A1, A2, A3, A4, A5, A6> inherited;
-
-    storage7( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7 ): storage6<A1, A2, A3, A4, A5, A6>( a1, a2, a3, a4, a5, a6 ), a7_( a7 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a7_, 0);
-    }
-
-    A7 a7_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, int I> struct storage7< A1, A2, A3, A4, A5, A6, boost::arg<I> >: public storage6< A1, A2, A3, A4, A5, A6 >
-{
-    typedef storage6<A1, A2, A3, A4, A5, A6> inherited;
-
-    storage7( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, boost::arg<I> ): storage6<A1, A2, A3, A4, A5, A6>( a1, a2, a3, a4, a5, a6 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a7_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, int I> struct storage7< A1, A2, A3, A4, A5, A6, boost::arg<I> (*) () >: public storage6< A1, A2, A3, A4, A5, A6 >
-{
-    typedef storage6<A1, A2, A3, A4, A5, A6> inherited;
-
-    storage7( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, boost::arg<I> (*) () ): storage6<A1, A2, A3, A4, A5, A6>( a1, a2, a3, a4, a5, a6 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a7_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 8
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> struct storage8: public storage7< A1, A2, A3, A4, A5, A6, A7 >
-{
-    typedef storage7<A1, A2, A3, A4, A5, A6, A7> inherited;
-
-    storage8( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8 ): storage7<A1, A2, A3, A4, A5, A6, A7>( a1, a2, a3, a4, a5, a6, a7 ), a8_( a8 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a8_, 0);
-    }
-
-    A8 a8_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, int I> struct storage8< A1, A2, A3, A4, A5, A6, A7, boost::arg<I> >: public storage7< A1, A2, A3, A4, A5, A6, A7 >
-{
-    typedef storage7<A1, A2, A3, A4, A5, A6, A7> inherited;
-
-    storage8( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, boost::arg<I> ): storage7<A1, A2, A3, A4, A5, A6, A7>( a1, a2, a3, a4, a5, a6, a7 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a8_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, int I> struct storage8< A1, A2, A3, A4, A5, A6, A7, boost::arg<I> (*) () >: public storage7< A1, A2, A3, A4, A5, A6, A7 >
-{
-    typedef storage7<A1, A2, A3, A4, A5, A6, A7> inherited;
-
-    storage8( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, boost::arg<I> (*) () ): storage7<A1, A2, A3, A4, A5, A6, A7>( a1, a2, a3, a4, a5, a6, a7 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a8_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 9
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> struct storage9: public storage8< A1, A2, A3, A4, A5, A6, A7, A8 >
-{
-    typedef storage8<A1, A2, A3, A4, A5, A6, A7, A8> inherited;
-
-    storage9( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9 ): storage8<A1, A2, A3, A4, A5, A6, A7, A8>( a1, a2, a3, a4, a5, a6, a7, a8 ), a9_( a9 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a9_, 0);
-    }
-
-    A9 a9_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, int I> struct storage9< A1, A2, A3, A4, A5, A6, A7, A8, boost::arg<I> >: public storage8< A1, A2, A3, A4, A5, A6, A7, A8 >
-{
-    typedef storage8<A1, A2, A3, A4, A5, A6, A7, A8> inherited;
-
-    storage9( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, boost::arg<I> ): storage8<A1, A2, A3, A4, A5, A6, A7, A8>( a1, a2, a3, a4, a5, a6, a7, a8 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a9_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, int I> struct storage9< A1, A2, A3, A4, A5, A6, A7, A8, boost::arg<I> (*) () >: public storage8< A1, A2, A3, A4, A5, A6, A7, A8 >
-{
-    typedef storage8<A1, A2, A3, A4, A5, A6, A7, A8> inherited;
-
-    storage9( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, boost::arg<I> (*) () ): storage8<A1, A2, A3, A4, A5, A6, A7, A8>( a1, a2, a3, a4, a5, a6, a7, a8 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a9_() { return boost::arg<I>(); }
-};
-
-#endif
-
-} // namespace _bi
-
-} // namespace boost
-
-#ifdef BOOST_MSVC
-# pragma warning(default: 4512) // assignment operator could not be generated
-# pragma warning(pop)
-#endif
-
-#endif // #ifndef BOOST_BIND_STORAGE_HPP_INCLUDED
--- a/include/boost/mem_fn.hpp
+++ b/include/boost/mem_fn.hpp
@@ -1,10 +1,8 @@
 #ifndef BOOST_MEM_FN_HPP_INCLUDED
 #define BOOST_MEM_FN_HPP_INCLUDED

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

 //
@@ -12,18 +10,17 @@
 //
 //  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
 //  Copyright (c) 2001 David Abrahams
-//  Copyright (c) 2003-2005 Peter Dimov
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //
 //  See http://www.boost.org/libs/bind/mem_fn.html for documentation.
 //

 #include <boost/config.hpp>
 #include <boost/get_pointer.hpp>
-#include <boost/detail/workaround.hpp>

 namespace boost
 {
@@ -49,18 +46,6 @@ template<class V> struct mf
 #undef BOOST_MEM_FN_CC
 #undef BOOST_MEM_FN_NAME

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
-
-#define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
-#define BOOST_MEM_FN_CC __cdecl
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
 #ifdef BOOST_MEM_FN_ENABLE_STDCALL

 #define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
@@ -102,18 +87,6 @@ template<> struct mf<void>
 #undef BOOST_MEM_FN_CC
 #undef BOOST_MEM_FN_NAME

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
-
-#define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
-#define BOOST_MEM_FN_CC __cdecl
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
 #ifdef BOOST_MEM_FN_ENABLE_STDCALL

 #define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
@@ -155,20 +128,6 @@ template<> struct mf<void>
 #undef BOOST_MEM_FN_NAME2
 #undef BOOST_MEM_FN_CC

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
-
-#define BOOST_MEM_FN_NAME(X) X##_cdecl
-#define BOOST_MEM_FN_NAME2(X) inner_##X##_cdecl
-#define BOOST_MEM_FN_CC __cdecl
-
-#include <boost/bind/mem_fn_vw.hpp>
-
-#undef BOOST_MEM_FN_NAME
-#undef BOOST_MEM_FN_NAME2
-#undef BOOST_MEM_FN_CC
-
-#endif
-
 #ifdef BOOST_MEM_FN_ENABLE_STDCALL

 #define BOOST_MEM_FN_NAME(X) X##_stdcall
@@ -217,18 +176,6 @@ namespace _mfi
 #undef BOOST_MEM_FN_CC
 #undef BOOST_MEM_FN_NAME

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
-
-#define BOOST_MEM_FN_NAME(X) X##_cdecl
-#define BOOST_MEM_FN_CC __cdecl
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
 #ifdef BOOST_MEM_FN_ENABLE_STDCALL

 #define BOOST_MEM_FN_NAME(X) X##_stdcall
@@ -270,18 +217,6 @@ namespace _mfi
 #undef BOOST_MEM_FN_NAME
 #undef BOOST_MEM_FN_CC

-#ifdef BOOST_MEM_FN_ENABLE_CDECL
-
-#define BOOST_MEM_FN_NAME(X) X##_cdecl
-#define BOOST_MEM_FN_CC __cdecl
-
-#include <boost/bind/mem_fn_cc.hpp>
-
-#undef BOOST_MEM_FN_NAME
-#undef BOOST_MEM_FN_CC
-
-#endif
-
 #ifdef BOOST_MEM_FN_ENABLE_STDCALL

 #define BOOST_MEM_FN_NAME(X) X##_stdcall
@@ -328,6 +263,11 @@ private:
        return (u.*f_);
    }

+    template<class U> R & call(U & u, T *) const
+    {
+        return (u.*f_);
+    }
+
    template<class U> R const & call(U & u, void const *) const
    {
        return (get_pointer(u)->*f_);
@@ -347,34 +287,24 @@ public:
        return (p->*f_);
    }

-    template<class U> R const & operator()(U const & u) const
+    template<class U> R const & operator()(U & u) const
    {
        return call(u, &u);
    }

-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && !BOOST_WORKAROUND(__MWERKS__, < 0x3200)
+#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1300)

    R & operator()(T & t) const
    {
        return (t.*f_);
    }

+#endif
+
    R const & operator()(T const & t) const
    {
        return (t.*f_);
    }
-
-#endif
-
-    bool operator==(dm const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(dm const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
 };

 } // namespace _mfi
--- a/index.html
+++ b/index.html
@@ -8,9 +8,3 @@ Automatic redirection failed, please go to
 <a href="mem_fn.html">mem_fn.html</a>.
 </body>
 </html>
-<!--
-	© Copyright Beman Dawes, 2001
-	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/mem_fn.html
+++ b/mem_fn.html
@@ -4,11 +4,6 @@
 </head>
 <body>
 Automatic redirection failed, please go to
-<a href="../bind/mem_fn.html">../bind/mem_fn.html</a>.&nbsp;<hr>
-<p>© Copyright Beman Dawes, 2001</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>
-<p>&nbsp;</p>
+<a href="../bind/mem_fn.html">../bind/mem_fn.html</a>.
 </body>
-</html>
+</html>
--- a/ref.html
+++ b/ref.html
@@ -7,9 +7,3 @@ Automatic redirection failed, please go to
 <a href="../../doc/html/ref.html">../../doc/html/ref.html</a>
 </body>
 </html>
-<!--
-	© Copyright Beman Dawes, 2001
-	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/test/Jamfile
+++ b/test/Jamfile
@@ -0,0 +1,26 @@
+#  Boost.Bind Library test Jamfile
+#
+#  Copyright (c) 2003 Peter Dimov
+#
+#  Permission to copy, use, modify, sell and distribute this software
+#  is granted provided this copyright notice appears in all copies.
+#  This software is provided "as is" without express or implied
+#  warranty, and with no claim as to its suitability for any purpose.
+
+subproject libs/bind/test ;
+
+# bring in rules for testing
+SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
+include testing.jam ;
+
+# Make tests run by default.
+DEPENDS all : bind ;
+
+{
+    test-suite "bind"
+        : [ run bind_test.cpp ]
+          [ run mem_fn_test.cpp ]
+          [ run mem_fn_void_test.cpp ]
+          [ run mem_fn_derived_test.cpp ]
+        ;
+}
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,34 +0,0 @@
-#  Boost.Bind Library test Jamfile
-#
-#  Copyright (c) 2003-2006 Peter Dimov
-#
-#  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)
-
-# bring in rules for testing
-import testing ;
-
-test-suite "bind"
-    : [ run bind_test.cpp ]
-      [ run bind_dm_test.cpp ]
-      [ run bind_eq_test.cpp ]
-      [ run bind_const_test.cpp ]
-      [ run bind_cv_test.cpp ]
-      [ run bind_stateful_test.cpp ]
-      [ run bind_dm2_test.cpp ]
-      [ run bind_not_test.cpp ]
-      [ run bind_rel_test.cpp ]
-      [ run bind_function_test.cpp ]
-      [ run bind_lookup_problem_test.cpp ]
-      [ run bind_rv_sp_test.cpp ]
-      [ compile bind_unary_addr.cpp ]
-      [ run bind_dm3_test.cpp ]
-      [ run bind_visit_test.cpp ]
-      [ run mem_fn_test.cpp ]
-      [ run mem_fn_void_test.cpp ]
-      [ run mem_fn_derived_test.cpp ]
-      [ run mem_fn_eq_test.cpp ]
-      [ run mem_fn_dm_test.cpp ]
-      [ run mem_fn_rv_test.cpp ]
-    ;
--- a/test/bind_cdecl_mf_test.cpp
+++ b/test/bind_cdecl_mf_test.cpp
@@ -1,164 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_cdecl_mf_test.cpp - test for bind.hpp + __cdecl (member functions)
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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_MEM_FN_ENABLE_CDECL
-
-#include <boost/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-struct X
-{
-    mutable unsigned int hash;
-
-    X(): hash(0) {}
-
-    int __cdecl f0() { f1(17); return 0; }
-    int __cdecl g0() const { g1(17); return 0; }
-
-    int __cdecl f1(int a1) { hash = (hash * 17041 + a1) % 32768; return 0; }
-    int __cdecl g1(int a1) const { hash = (hash * 17041 + a1 * 2) % 32768; return 0; }
-
-    int __cdecl f2(int a1, int a2) { f1(a1); f1(a2); return 0; }
-    int __cdecl g2(int a1, int a2) const { g1(a1); g1(a2); return 0; }
-
-    int __cdecl f3(int a1, int a2, int a3) { f2(a1, a2); f1(a3); return 0; }
-    int __cdecl g3(int a1, int a2, int a3) const { g2(a1, a2); g1(a3); return 0; }
-
-    int __cdecl f4(int a1, int a2, int a3, int a4) { f3(a1, a2, a3); f1(a4); return 0; }
-    int __cdecl g4(int a1, int a2, int a3, int a4) const { g3(a1, a2, a3); g1(a4); return 0; }
-
-    int __cdecl f5(int a1, int a2, int a3, int a4, int a5) { f4(a1, a2, a3, a4); f1(a5); return 0; }
-    int __cdecl g5(int a1, int a2, int a3, int a4, int a5) const { g4(a1, a2, a3, a4); g1(a5); return 0; }
-
-    int __cdecl f6(int a1, int a2, int a3, int a4, int a5, int a6) { f5(a1, a2, a3, a4, a5); f1(a6); return 0; }
-    int __cdecl g6(int a1, int a2, int a3, int a4, int a5, int a6) const { g5(a1, a2, a3, a4, a5); g1(a6); return 0; }
-
-    int __cdecl f7(int a1, int a2, int a3, int a4, int a5, int a6, int a7) { f6(a1, a2, a3, a4, a5, a6); f1(a7); return 0; }
-    int __cdecl g7(int a1, int a2, int a3, int a4, int a5, int a6, int a7) const { g6(a1, a2, a3, a4, a5, a6); g1(a7); return 0; }
-
-    int __cdecl f8(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) { f7(a1, a2, a3, a4, a5, a6, a7); f1(a8); return 0; }
-    int __cdecl g8(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) const { g7(a1, a2, a3, a4, a5, a6, a7); g1(a8); return 0; }
-};
-
-void member_function_test()
-{
-    using namespace boost;
-
-    X x;
-
-    // 0
-
-    bind(&X::f0, &x)();
-    bind(&X::f0, ref(x))();
-
-    bind(&X::g0, &x)();
-    bind(&X::g0, x)();
-    bind(&X::g0, ref(x))();
-
-    // 1
-
-    bind(&X::f1, &x, 1)();
-    bind(&X::f1, ref(x), 1)();
-
-    bind(&X::g1, &x, 1)();
-    bind(&X::g1, x, 1)();
-    bind(&X::g1, ref(x), 1)();
-
-    // 2
-
-    bind(&X::f2, &x, 1, 2)();
-    bind(&X::f2, ref(x), 1, 2)();
-
-    bind(&X::g2, &x, 1, 2)();
-    bind(&X::g2, x, 1, 2)();
-    bind(&X::g2, ref(x), 1, 2)();
-
-    // 3
-
-    bind(&X::f3, &x, 1, 2, 3)();
-    bind(&X::f3, ref(x), 1, 2, 3)();
-
-    bind(&X::g3, &x, 1, 2, 3)();
-    bind(&X::g3, x, 1, 2, 3)();
-    bind(&X::g3, ref(x), 1, 2, 3)();
-
-    // 4
-
-    bind(&X::f4, &x, 1, 2, 3, 4)();
-    bind(&X::f4, ref(x), 1, 2, 3, 4)();
-
-    bind(&X::g4, &x, 1, 2, 3, 4)();
-    bind(&X::g4, x, 1, 2, 3, 4)();
-    bind(&X::g4, ref(x), 1, 2, 3, 4)();
-
-    // 5
-
-    bind(&X::f5, &x, 1, 2, 3, 4, 5)();
-    bind(&X::f5, ref(x), 1, 2, 3, 4, 5)();
-
-    bind(&X::g5, &x, 1, 2, 3, 4, 5)();
-    bind(&X::g5, x, 1, 2, 3, 4, 5)();
-    bind(&X::g5, ref(x), 1, 2, 3, 4, 5)();
-
-    // 6
-
-    bind(&X::f6, &x, 1, 2, 3, 4, 5, 6)();
-    bind(&X::f6, ref(x), 1, 2, 3, 4, 5, 6)();
-
-    bind(&X::g6, &x, 1, 2, 3, 4, 5, 6)();
-    bind(&X::g6, x, 1, 2, 3, 4, 5, 6)();
-    bind(&X::g6, ref(x), 1, 2, 3, 4, 5, 6)();
-
-    // 7
-
-    bind(&X::f7, &x, 1, 2, 3, 4, 5, 6, 7)();
-    bind(&X::f7, ref(x), 1, 2, 3, 4, 5, 6, 7)();
-
-    bind(&X::g7, &x, 1, 2, 3, 4, 5, 6, 7)();
-    bind(&X::g7, x, 1, 2, 3, 4, 5, 6, 7)();
-    bind(&X::g7, ref(x), 1, 2, 3, 4, 5, 6, 7)();
-
-    // 8
-
-    bind(&X::f8, &x, 1, 2, 3, 4, 5, 6, 7, 8)();
-    bind(&X::f8, ref(x), 1, 2, 3, 4, 5, 6, 7, 8)();
-
-    bind(&X::g8, &x, 1, 2, 3, 4, 5, 6, 7, 8)();
-    bind(&X::g8, x, 1, 2, 3, 4, 5, 6, 7, 8)();
-    bind(&X::g8, ref(x), 1, 2, 3, 4, 5, 6, 7, 8)();
-
-    BOOST_TEST( x.hash == 23558 );
-}
-
-int main()
-{
-    member_function_test();
-    return boost::report_errors();
-}
--- a/test/bind_const_test.cpp
+++ b/test/bind_const_test.cpp
@@ -1,184 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_const_test.cpp - test const bind objects
-//
-//  Copyright (c) 2001-2004 Peter Dimov and Multi Media Ltd.
-//  Copyright (c) 2001 David Abrahams
-//
-// 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/bind.hpp>
-#include <boost/ref.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-//
-
-long f_0()
-{
-    return 17041L;
-}
-
-long f_1(long a)
-{
-    return a;
-}
-
-long f_2(long a, long b)
-{
-    return a + 10 * b;
-}
-
-long f_3(long a, long b, long c)
-{
-    return a + 10 * b + 100 * c;
-}
-
-long f_4(long a, long b, long c, long d)
-{
-    return a + 10 * b + 100 * c + 1000 * d;
-}
-
-long f_5(long a, long b, long c, long d, long e)
-{
-    return a + 10 * b + 100 * c + 1000 * d + 10000 * e;
-}
-
-long f_6(long a, long b, long c, long d, long e, long f)
-{
-    return a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f;
-}
-
-long f_7(long a, long b, long c, long d, long e, long f, long g)
-{
-    return a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f + 1000000 * g;
-}
-
-long f_8(long a, long b, long c, long d, long e, long f, long g, long h)
-{
-    return a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f + 1000000 * g + 10000000 * h;
-}
-
-long f_9(long a, long b, long c, long d, long e, long f, long g, long h, long i)
-{
-    return a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f + 1000000 * g + 10000000 * h + 100000000 * i;
-}
-
-long global_result;
-
-void fv_0()
-{
-    global_result = 17041L;
-}
-
-void fv_1(long a)
-{
-    global_result = a;
-}
-
-void fv_2(long a, long b)
-{
-    global_result = a + 10 * b;
-}
-
-void fv_3(long a, long b, long c)
-{
-    global_result = a + 10 * b + 100 * c;
-}
-
-void fv_4(long a, long b, long c, long d)
-{
-    global_result = a + 10 * b + 100 * c + 1000 * d;
-}
-
-void fv_5(long a, long b, long c, long d, long e)
-{
-    global_result = a + 10 * b + 100 * c + 1000 * d + 10000 * e;
-}
-
-void fv_6(long a, long b, long c, long d, long e, long f)
-{
-    global_result = a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f;
-}
-
-void fv_7(long a, long b, long c, long d, long e, long f, long g)
-{
-    global_result = a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f + 1000000 * g;
-}
-
-void fv_8(long a, long b, long c, long d, long e, long f, long g, long h)
-{
-    global_result = a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f + 1000000 * g + 10000000 * h;
-}
-
-void fv_9(long a, long b, long c, long d, long e, long f, long g, long h, long i)
-{
-    global_result = a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f + 1000000 * g + 10000000 * h + 100000000 * i;
-}
-
-template<class F, class A> long test(F const & f, A const & a)
-{
-    return f(a);
-}
-
-template<class F, class A> long testv(F const & f, A const & a)
-{
-    f(a);
-    return global_result;
-}
-
-void function_test()
-{
-    using namespace boost;
-
-    int const i = 1;
-
-    BOOST_TEST( test( bind(f_0), i ) == 17041L );
-    BOOST_TEST( test( bind(f_1, _1), i ) == 1L );
-    BOOST_TEST( test( bind(f_2, _1, 2), i ) == 21L );
-    BOOST_TEST( test( bind(f_3, _1, 2, 3), i ) == 321L );
-    BOOST_TEST( test( bind(f_4, _1, 2, 3, 4), i ) == 4321L );
-    BOOST_TEST( test( bind(f_5, _1, 2, 3, 4, 5), i ) == 54321L );
-    BOOST_TEST( test( bind(f_6, _1, 2, 3, 4, 5, 6), i ) == 654321L );
-    BOOST_TEST( test( bind(f_7, _1, 2, 3, 4, 5, 6, 7), i ) == 7654321L );
-    BOOST_TEST( test( bind(f_8, _1, 2, 3, 4, 5, 6, 7, 8), i ) == 87654321L );
-    BOOST_TEST( test( bind(f_9, _1, 2, 3, 4, 5, 6, 7, 8, 9), i ) == 987654321L );
-
-    BOOST_TEST( testv( bind(fv_0), i ) == 17041L );
-    BOOST_TEST( testv( bind(fv_1, _1), i ) == 1L );
-    BOOST_TEST( testv( bind(fv_2, _1, 2), i ) == 21L );
-    BOOST_TEST( testv( bind(fv_3, _1, 2, 3), i ) == 321L );
-    BOOST_TEST( testv( bind(fv_4, _1, 2, 3, 4), i ) == 4321L );
-    BOOST_TEST( testv( bind(fv_5, _1, 2, 3, 4, 5), i ) == 54321L );
-    BOOST_TEST( testv( bind(fv_6, _1, 2, 3, 4, 5, 6), i ) == 654321L );
-    BOOST_TEST( testv( bind(fv_7, _1, 2, 3, 4, 5, 6, 7), i ) == 7654321L );
-    BOOST_TEST( testv( bind(fv_8, _1, 2, 3, 4, 5, 6, 7, 8), i ) == 87654321L );
-    BOOST_TEST( testv( bind(fv_9, _1, 2, 3, 4, 5, 6, 7, 8, 9), i ) == 987654321L );
-}
-
-int main()
-{
-    function_test();
-    return boost::report_errors();
-}
--- a/test/bind_cv_test.cpp
+++ b/test/bind_cv_test.cpp
@@ -1,158 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_cv_test.cpp
-//
-//  Copyright (c) 2004 Peter Dimov
-//
-// 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/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-struct X
-{
-    int operator()()
-    {
-        return 17041;
-    }
-
-    int operator()() const
-    {
-        return -17041;
-    }
-
-    int operator()(int x1)
-    {
-        return x1;
-    }
-
-    int operator()(int x1) const
-    {
-        return -x1;
-    }
-
-    int operator()(int x1, int x2)
-    {
-        return x1+x2;
-    }
-
-    int operator()(int x1, int x2) const
-    {
-        return -(x1+x2);
-    }
-
-    int operator()(int x1, int x2, int x3)
-    {
-        return x1+x2+x3;
-    }
-
-    int operator()(int x1, int x2, int x3) const
-    {
-        return -(x1+x2+x3);
-    }
-
-    int operator()(int x1, int x2, int x3, int x4)
-    {
-        return x1+x2+x3+x4;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4) const
-    {
-        return -(x1+x2+x3+x4);
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5)
-    {
-        return x1+x2+x3+x4+x5;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5) const
-    {
-        return -(x1+x2+x3+x4+x5);
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6)
-    {
-        return x1+x2+x3+x4+x5+x6;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6) const
-    {
-        return -(x1+x2+x3+x4+x5+x6);
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6, int x7)
-    {
-        return x1+x2+x3+x4+x5+x6+x7;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6, int x7) const
-    {
-        return -(x1+x2+x3+x4+x5+x6+x7);
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6, int x7, int x8)
-    {
-        return x1+x2+x3+x4+x5+x6+x7+x8;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6, int x7, int x8) const
-    {
-        return -(x1+x2+x3+x4+x5+x6+x7+x8);
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6, int x7, int x8, int x9)
-    {
-        return x1+x2+x3+x4+x5+x6+x7+x8+x9;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6, int x7, int x8, int x9) const
-    {
-        return -(x1+x2+x3+x4+x5+x6+x7+x8+x9);
-    }
-};
-
-template<class F> void test(F f, int r)
-{
-    F const & cf = f;
-    BOOST_TEST( cf() == -r );
-    BOOST_TEST( f() == r );
-}
-
-int main()
-{
-    test( boost::bind<int>( X() ), 17041 );
-    test( boost::bind<int>( X(), 1 ), 1 );
-    test( boost::bind<int>( X(), 1, 2 ), 1+2 );
-    test( boost::bind<int>( X(), 1, 2, 3 ), 1+2+3 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4 ), 1+2+3+4 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4, 5 ), 1+2+3+4+5 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4, 5, 6 ), 1+2+3+4+5+6 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4, 5, 6, 7 ), 1+2+3+4+5+6+7 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4, 5, 6, 7, 8 ), 1+2+3+4+5+6+7+8 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4, 5, 6, 7, 8, 9 ), 1+2+3+4+5+6+7+8+9 );
-
-    return boost::report_errors();
-}
--- a/test/bind_dm2_test.cpp
+++ b/test/bind_dm2_test.cpp
@@ -1,70 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_dm2_test.cpp - data members, advanced uses
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-#include <string>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-struct X
-{
-    int m;
-};
-
-struct Y
-{
-    char m[ 64 ];
-};
-
-int main()
-{
-    X x = { 0 };
-    X * px = &x;
-
-    boost::bind< int& >( &X::m, _1 )( px ) = 42;
-
-    BOOST_TEST( x.m == 42 );
-
-    boost::bind< int& >( &X::m, boost::ref(x) )() = 17041;
-
-    BOOST_TEST( x.m == 17041 );
-
-    X const * pcx = &x;
-
-    BOOST_TEST( boost::bind< long >( &X::m, _1 )( pcx ) == 17041L );
-    BOOST_TEST( boost::bind< long >( &X::m, pcx )() == 17041L );
-
-    Y y = { "test" };
-    std::string v( "test" );
-
-    BOOST_TEST( boost::bind< char const* >( &Y::m, &y )() == v );
-    BOOST_TEST( boost::bind< std::string >( &Y::m, &y )() == v );
-
-    return boost::report_errors();
-}
--- a/test/bind_dm3_test.cpp
+++ b/test/bind_dm3_test.cpp
@@ -1,46 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_dm3_test.cpp - data members (regression 1.31 - 1.32)
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-#include <utility>
-
-int main()
-{
-    typedef std::pair<int, int> pair_type;
-
-    pair_type pair( 10, 20 );
-
-    int const & x = boost::bind( &pair_type::first, _1 )( pair );
-
-    BOOST_TEST( &pair.first == &x );
-
-    return boost::report_errors();
-}
--- a/test/bind_dm_test.cpp
+++ b/test/bind_dm_test.cpp
@@ -1,73 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_dm_test.cpp - data members
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-struct X
-{
-    int m;
-};
-
-X f( int v )
-{
-    X r = { v };
-    return r;
-}
-
-int main()
-{
-    X x = { 17041 };
-    X * px = &x;
-
-    BOOST_TEST( boost::bind( &X::m, _1 )( x ) == 17041 );
-    BOOST_TEST( boost::bind( &X::m, _1 )( px ) == 17041 );
-
-    BOOST_TEST( boost::bind( &X::m, x )() == 17041 );
-    BOOST_TEST( boost::bind( &X::m, px )() == 17041 );
-    BOOST_TEST( boost::bind( &X::m, boost::ref(x) )() == 17041 );
-
-
-    X const cx = x;
-    X const * pcx = &cx;
-
-    BOOST_TEST( boost::bind( &X::m, _1 )( cx ) == 17041 );
-    BOOST_TEST( boost::bind( &X::m, _1 )( pcx ) == 17041 );
-
-    BOOST_TEST( boost::bind( &X::m, cx )() == 17041 );
-    BOOST_TEST( boost::bind( &X::m, pcx )() == 17041 );
-    BOOST_TEST( boost::bind( &X::m, boost::ref(cx) )() == 17041 );
-
-    int const v = 42;
-
-    BOOST_TEST( boost::bind( &X::m, boost::bind( f, _1 ) )( v ) == v );
-
-    return boost::report_errors();
-}
--- a/test/bind_eq_test.cpp
+++ b/test/bind_eq_test.cpp
@@ -1,427 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_eq_test.cpp - boost::bind equality operator
-//
-//  Copyright (c) 2004, 2005 Peter Dimov
-//
-// 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/bind.hpp>
-#include <boost/ref.hpp>
-
-#ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-# include <boost/function_equal.hpp>
-#endif
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-struct X
-{
-    int i_;
-
-    explicit X(int i): i_(i)
-    {
-    }
-
-    bool operator==(X const & rhs) const
-    {
-        return i_ == rhs.i_;
-    }
-};
-
-// f_*
-
-int f_0()
-{
-    return 0;
-}
-
-int f_1(X)
-{
-    return 0;
-}
-
-int f_2(X, X)
-{
-    return 0;
-}
-
-int f_3(X, X, X)
-{
-    return 0;
-}
-
-int f_4(X, X, X, X)
-{
-    return 0;
-}
-
-int f_5(X, X, X, X, X)
-{
-    return 0;
-}
-
-int f_6(X, X, X, X, X, X)
-{
-    return 0;
-}
-
-int f_7(X, X, X, X, X, X, X)
-{
-    return 0;
-}
-
-int f_8(X, X, X, X, X, X, X, X)
-{
-    return 0;
-}
-
-int f_9(X, X, X, X, X, X, X, X, X)
-{
-    return 0;
-}
-
-// fv_*
-
-void fv_0()
-{
-}
-
-void fv_1(X)
-{
-}
-
-void fv_2(X, X)
-{
-}
-
-void fv_3(X, X, X)
-{
-}
-
-void fv_4(X, X, X, X)
-{
-}
-
-void fv_5(X, X, X, X, X)
-{
-}
-
-void fv_6(X, X, X, X, X, X)
-{
-}
-
-void fv_7(X, X, X, X, X, X, X)
-{
-}
-
-void fv_8(X, X, X, X, X, X, X, X)
-{
-}
-
-void fv_9(X, X, X, X, X, X, X, X, X)
-{
-}
-
-template<class F> void test_eq(F f1, F f2)
-{
-#ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-
-    using boost::function_equal;
-
-#endif
-
-    BOOST_TEST( function_equal( f1, f2 ) );
-}
-
-template<class F> void test_ne(F f1, F f2)
-{
-#ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-
-    using boost::function_equal;
-
-#endif
-
-    BOOST_TEST( !function_equal( f1, f2 ) );
-}
-
-// 0
-
-template<class F> void test_0(F f)
-{
-    test_eq( boost::bind(f), boost::bind(f) );
-}
-
-// 1
-
-template<class F, class V> void test_1_(F f, V v1, V v2)
-{
-    test_eq( boost::bind(f, v1), boost::bind(f, v1) );
-    test_ne( boost::bind(f, v1), boost::bind(f, v2) );
-}
-
-template<class F> void test_1(F f)
-{
-    test_eq( boost::bind(f, _1), boost::bind(f, _1) );
-
-    test_1_( f, X(1), X(2) );
-
-    X a(0), b(0);
-    test_1_( f, boost::ref(a), boost::ref(b) );
-}
-
-// 2
-
-template<class F, class V> void test_2_(F f, V v1, V v2)
-{
-    test_eq( boost::bind(f, v1, v1), boost::bind(f, v1, v1) );
-    test_ne( boost::bind(f, v1, v1), boost::bind(f, v1, v2) );
-    test_ne( boost::bind(f, v1, v1), boost::bind(f, v2, v1) );
-}
-
-template<class F> void test_2(F f)
-{
-    test_eq( boost::bind(f, _1, _2), boost::bind(f, _1, _2) );
-
-    test_2_( f, X(1), X(2) );
-
-    X a(0), b(0);
-    test_2_( f, boost::ref(a), boost::ref(b) );
-}
-
-// 3
-
-template<class F, class V> void test_3_(F f, V v1, V v2)
-{
-    test_eq( boost::bind(f, v1, v1, v1), boost::bind(f, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1), boost::bind(f, v1, v1, v2) );
-    test_ne( boost::bind(f, v1, v1, v1), boost::bind(f, v1, v2, v1) );
-    test_ne( boost::bind(f, v1, v1, v1), boost::bind(f, v2, v1, v1) );
-}
-
-template<class F> void test_3(F f)
-{
-    test_eq( boost::bind(f, _1, _2, _3), boost::bind(f, _1, _2, _3) );
-
-    test_3_( f, X(1), X(2) );
-
-    X a(0), b(0);
-    test_3_( f, boost::ref(a), boost::ref(b) );
-}
-
-// 4
-
-template<class F, class V> void test_4_(F f, V v1, V v2)
-{
-    test_eq( boost::bind(f, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v2) );
-    test_ne( boost::bind(f, v1, v1, v1, v1), boost::bind(f, v1, v1, v2, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1), boost::bind(f, v1, v2, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1), boost::bind(f, v2, v1, v1, v1) );
-}
-
-template<class F> void test_4(F f)
-{
-    test_eq( boost::bind(f, _1, _2, _3, _4), boost::bind(f, _1, _2, _3, _4) );
-
-    test_4_( f, X(1), X(2) );
-
-    X a(0), b(0);
-    test_4_( f, boost::ref(a), boost::ref(b) );
-}
-
-// 5
-
-template<class F, class V> void test_5_(F f, V v1, V v2)
-{
-    test_eq( boost::bind(f, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v2) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v2, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v2, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1), boost::bind(f, v1, v2, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1), boost::bind(f, v2, v1, v1, v1, v1) );
-}
-
-template<class F> void test_5(F f)
-{
-    test_eq( boost::bind(f, _1, _2, _3, _4, _5), boost::bind(f, _1, _2, _3, _4, _5) );
-
-    test_5_( f, X(1), X(2) );
-
-    X a(0), b(0);
-    test_5_( f, boost::ref(a), boost::ref(b) );
-}
-
-// 6
-
-template<class F, class V> void test_6_(F f, V v1, V v2)
-{
-    test_eq( boost::bind(f, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v2) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v2, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v2, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v2, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v2, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1), boost::bind(f, v2, v1, v1, v1, v1, v1) );
-}
-
-template<class F> void test_6(F f)
-{
-    test_eq( boost::bind(f, _1, _2, _3, _4, _5, _6), boost::bind(f, _1, _2, _3, _4, _5, _6) );
-
-    test_6_( f, X(1), X(2) );
-
-    X a(0), b(0);
-    test_6_( f, boost::ref(a), boost::ref(b) );
-}
-
-// 7
-
-template<class F, class V> void test_7_(F f, V v1, V v2)
-{
-    test_eq( boost::bind(f, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v1, v2) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v2, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v2, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v2, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v2, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v2, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v2, v1, v1, v1, v1, v1, v1) );
-}
-
-template<class F> void test_7(F f)
-{
-    test_eq( boost::bind(f, _1, _2, _3, _4, _5, _6, _7), boost::bind(f, _1, _2, _3, _4, _5, _6, _7) );
-
-    test_7_( f, X(1), X(2) );
-
-    X a(0), b(0);
-    test_7_( f, boost::ref(a), boost::ref(b) );
-}
-
-// 8
-
-template<class F, class V> void test_8_(F f, V v1, V v2)
-{
-    test_eq( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v2) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v1, v2, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v2, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v2, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v2, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v2, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v2, v1, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v2, v1, v1, v1, v1, v1, v1, v1) );
-}
-
-template<class F> void test_8(F f)
-{
-    test_eq( boost::bind(f, _1, _2, _3, _4, _5, _6, _7, _8), boost::bind(f, _1, _2, _3, _4, _5, _6, _7, _8) );
-
-    test_8_( f, X(1), X(2) );
-
-    X a(0), b(0);
-    test_8_( f, boost::ref(a), boost::ref(b) );
-}
-
-// 9
-
-template<class F, class V> void test_9_(F f, V v1, V v2)
-{
-    test_eq( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v2) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v2, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v1, v2, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v1, v2, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v1, v2, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v1, v2, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v1, v2, v1, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v1, v2, v1, v1, v1, v1, v1, v1, v1) );
-    test_ne( boost::bind(f, v1, v1, v1, v1, v1, v1, v1, v1, v1), boost::bind(f, v2, v1, v1, v1, v1, v1, v1, v1, v1) );
-}
-
-template<class F> void test_9(F f)
-{
-    test_eq( boost::bind(f, _1, _2, _3, _4, _5, _6, _7, _8, _9), boost::bind(f, _1, _2, _3, _4, _5, _6, _7, _8, _9) );
-
-    test_9_( f, X(1), X(2) );
-
-    X a(0), b(0);
-    test_9_( f, boost::ref(a), boost::ref(b) );
-}
-
-int main()
-{
-    // 0
-
-    test_0( f_0 );
-    test_0( fv_0 );
-
-    // 1
-
-    test_1( f_1 );
-    test_1( fv_1 );
-
-    // 2
-
-    test_2( f_2 );
-    test_2( fv_2 );
-
-    // 3
-
-    test_3( f_3 );
-    test_3( fv_3 );
-
-    // 4
-
-    test_4( f_4 );
-    test_4( fv_4 );
-
-    // 5
-
-    test_5( f_5 );
-    test_5( fv_5 );
-
-    // 6
-
-    test_6( f_6 );
-    test_6( fv_6 );
-
-    // 7
-
-    test_7( f_7 );
-    test_7( fv_7 );
-
-    // 8
-
-    test_8( f_8 );
-    test_8( fv_8 );
-
-    // 9
-
-    test_9( f_9 );
-    test_9( fv_9 );
-
-    return boost::report_errors();
-}
--- a/test/bind_fastcall_mf_test.cpp
+++ b/test/bind_fastcall_mf_test.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #define BOOST_MEM_FN_ENABLE_FASTCALL
--- a/test/bind_fastcall_test.cpp
+++ b/test/bind_fastcall_test.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #define BOOST_BIND_ENABLE_FASTCALL
--- a/test/bind_function_test.cpp
+++ b/test/bind_function_test.cpp
@@ -1,77 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_function_test.cpp - function<>
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-#include <boost/function.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/bind.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-int f( int x )
-{
-    return x;
-}
-
-int g( int x )
-{
-    return x + 1;
-}
-
-int main()
-{
-    boost::function0<int> fn;
-
-    BOOST_TEST( !fn.contains( boost::bind( f, 1 ) ) );
-    BOOST_TEST( !fn.contains( boost::bind( f, 2 ) ) );
-    BOOST_TEST( !fn.contains( boost::bind( g, 1 ) ) );
-
-    fn = boost::bind( f, 1 );
-
-    BOOST_TEST( fn() == 1 );
-
-    BOOST_TEST( fn.contains( boost::bind( f, 1 ) ) );
-    BOOST_TEST( !fn.contains( boost::bind( f, 2 ) ) );
-    BOOST_TEST( !fn.contains( boost::bind( g, 1 ) ) );
-
-    fn = boost::bind( f, 2 );
-
-    BOOST_TEST( fn() == 2 );
-
-    BOOST_TEST( !fn.contains( boost::bind( f, 1 ) ) );
-    BOOST_TEST( fn.contains( boost::bind( f, 2 ) ) );
-    BOOST_TEST( !fn.contains( boost::bind( g, 1 ) ) );
-
-    fn = boost::bind( g, 1 );
-
-    BOOST_TEST( fn() == 2 );
-
-    BOOST_TEST( !fn.contains( boost::bind( f, 1 ) ) );
-    BOOST_TEST( !fn.contains( boost::bind( f, 2 ) ) );
-    BOOST_TEST( fn.contains( boost::bind( g, 1 ) ) );
-
-    return boost::report_errors();
-}
--- a/test/bind_lookup_problem_test.cpp
+++ b/test/bind_lookup_problem_test.cpp
@@ -1,40 +0,0 @@
-//
-// bind_lookup_problem_test.cpp
-//
-// Copyright (C) Markus Schöpflin 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)
-//
-
-#include <boost/bind.hpp>
-
-template<class T> void value();
-
-void f0() { }
-void f1(int) { }
-void f2(int, int) { }
-void f3(int, int, int) { }
-void f4(int, int, int, int) { }
-void f5(int, int, int, int, int) { }
-void f6(int, int, int, int, int, int) { }
-void f7(int, int, int, int, int, int, int) { }
-void f8(int, int, int, int, int, int, int, int) { }
-void f9(int, int, int, int, int, int, int, int, int) { }
-
-int main()
-{
-  boost::bind(f0);
-  boost::bind(f1, 0);
-  boost::bind(f2, 0, 0);
-  boost::bind(f3, 0, 0, 0);
-  boost::bind(f4, 0, 0, 0, 0);
-  boost::bind(f5, 0, 0, 0, 0, 0);
-  boost::bind(f6, 0, 0, 0, 0, 0, 0);
-  boost::bind(f7, 0, 0, 0, 0, 0, 0, 0);
-  boost::bind(f8, 0, 0, 0, 0, 0, 0, 0, 0);
-  boost::bind(f9, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-  return 0;
-}
--- a/test/bind_not_test.cpp
+++ b/test/bind_not_test.cpp
@@ -1,57 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_not_test.cpp - operator!
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-template<class F, class A1, class R> void test( F f, A1 a1, R r )
-{
-    BOOST_TEST( f(a1) == r );
-}
-
-bool f( bool v )
-{
-    return v;
-}
-
-int g( int v )
-{
-    return v;
-}
-
-int main()
-{
-    test( !boost::bind( f, true ), 0, !f( true ) );
-    test( !boost::bind( g, _1 ), 5, !g( 5 ) );
-    test( boost::bind( f, !boost::bind( f, true ) ), 0, f( !f( true ) ) );
-    test( boost::bind( f, !boost::bind( f, _1 ) ), true, f( !f( true ) ) );
-
-    return boost::report_errors();
-}
--- a/test/bind_rel_test.cpp
+++ b/test/bind_rel_test.cpp
@@ -1,97 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_rel_test.cpp - ==, !=, <, <=, >, >= operators
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-int f( int x )
-{
-    return x + x;
-}
-
-int g( int x )
-{
-    return 2 * x;
-}
-
-int main()
-{
-    int x = 4;
-    int y = x + x;
-
-    // bind op value
-
-    BOOST_TEST( ( boost::bind( f, _1 ) == y )( x ) );
-    BOOST_TEST( !( ( boost::bind( f, _1 ) != y )( x ) ) );
-
-    BOOST_TEST( !( ( boost::bind( f, _1 ) < y )( x ) ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) < y + 1 )( x ) );
-
-    BOOST_TEST( !( ( boost::bind( f, _1 ) > y )( x ) ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) > y - 1 )( x ) );
-
-    BOOST_TEST( !( ( boost::bind( f, _1 ) <= y - 1 )( x ) ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) <= y )( x ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) <= y + 1 )( x ) );
-
-    BOOST_TEST( !( ( boost::bind( f, _1 ) >= y + 1 )( x ) ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) >= y )( x ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) >= y - 1 )( x ) );
-
-    // bind op ref
-
-    BOOST_TEST( ( boost::bind( f, _1 ) == boost::ref( y ) )( x ) );
-    BOOST_TEST( !( ( boost::bind( f, _1 ) != boost::ref( y ) )( x ) ) );
-    BOOST_TEST( !( ( boost::bind( f, _1 ) < boost::ref( y ) )( x ) ) );
-    BOOST_TEST( !( ( boost::bind( f, _1 ) > boost::ref( y ) )( x ) ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) <= boost::ref( y ) )( x ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) >= boost::ref( y ) )( x ) );
-
-    // bind op placeholder
-
-    BOOST_TEST( ( boost::bind( f, _1 ) == _2 )( x, y ) );
-    BOOST_TEST( !( ( boost::bind( f, _1 ) != _2 )( x, y ) ) );
-    BOOST_TEST( !( ( boost::bind( f, _1 ) < _2 )( x, y ) ) );
-    BOOST_TEST( !( ( boost::bind( f, _1 ) > _2 )( x, y ) ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) <= _2 )( x, y ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) >= _2 )( x, y ) );
-
-    // bind op bind
-
-    // important: bind( f, _1 ) and bind( g, _1 ) have the same type
-    BOOST_TEST( ( boost::bind( f, _1 ) == boost::bind( g, _1 ) )( x ) );
-    BOOST_TEST( !( ( boost::bind( f, _1 ) != boost::bind( g, _1 ) )( x ) ) );
-    BOOST_TEST( !( ( boost::bind( f, _1 ) < boost::bind( g, _1 ) )( x ) ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) <= boost::bind( g, _1 ) )( x ) );
-    BOOST_TEST( !( ( boost::bind( f, _1 ) > boost::bind( g, _1 ) )( x ) ) );
-    BOOST_TEST( ( boost::bind( f, _1 ) >= boost::bind( g, _1 ) )( x ) );
-
-    return boost::report_errors();
-}
--- a/test/bind_rv_sp_test.cpp
+++ b/test/bind_rv_sp_test.cpp
@@ -1,64 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_rv_sp_test.cpp - smart pointer returned by value from an inner bind
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-#include <boost/shared_ptr.hpp>
-
-struct X
-{
-    int v_;
-
-    X( int v ): v_( v )
-    {
-    }
-
-    int f()
-    {
-        return v_;
-    }
-};
-
-struct Y
-{
-    boost::shared_ptr<X> f()
-    {
-        return boost::shared_ptr<X>( new X( 42 ) );
-    }
-};
-
-int main()
-{
-    Y y;
-
-    BOOST_TEST( boost::bind( &X::f, boost::bind( &Y::f, &y ) )() == 42 );
-
-    return boost::report_errors();
-}
--- a/test/bind_stateful_test.cpp
+++ b/test/bind_stateful_test.cpp
@@ -1,222 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_stateful_test.cpp
-//
-//  Copyright (c) 2004 Peter Dimov
-//
-// 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/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-class X
-{
-private:
-
-    int state_;
-
-public:
-
-    X(): state_(0)
-    {
-    }
-
-    int state() const
-    {
-        return state_;
-    }
-
-    int operator()()
-    {
-        return state_ += 17041;
-    }
-
-    int operator()(int x1)
-    {
-        return state_ += x1;
-    }
-
-    int operator()(int x1, int x2)
-    {
-        return state_ += x1+x2;
-    }
-
-    int operator()(int x1, int x2, int x3)
-    {
-        return state_ += x1+x2+x3;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4)
-    {
-        return state_ += x1+x2+x3+x4;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5)
-    {
-        return state_ += x1+x2+x3+x4+x5;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6)
-    {
-        return state_ += x1+x2+x3+x4+x5+x6;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6, int x7)
-    {
-        return state_ += x1+x2+x3+x4+x5+x6+x7;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6, int x7, int x8)
-    {
-        return state_ += x1+x2+x3+x4+x5+x6+x7+x8;
-    }
-
-    int operator()(int x1, int x2, int x3, int x4, int x5, int x6, int x7, int x8, int x9)
-    {
-        return state_ += x1+x2+x3+x4+x5+x6+x7+x8+x9;
-    }
-};
-
-int f0(int & state_)
-{
-    return state_ += 17041;
-}
-
-int f1(int & state_, int x1)
-{
-    return state_ += x1;
-}
-
-int f2(int & state_, int x1, int x2)
-{
-    return state_ += x1+x2;
-}
-
-int f3(int & state_, int x1, int x2, int x3)
-{
-    return state_ += x1+x2+x3;
-}
-
-int f4(int & state_, int x1, int x2, int x3, int x4)
-{
-    return state_ += x1+x2+x3+x4;
-}
-
-int f5(int & state_, int x1, int x2, int x3, int x4, int x5)
-{
-    return state_ += x1+x2+x3+x4+x5;
-}
-
-int f6(int & state_, int x1, int x2, int x3, int x4, int x5, int x6)
-{
-    return state_ += x1+x2+x3+x4+x5+x6;
-}
-
-int f7(int & state_, int x1, int x2, int x3, int x4, int x5, int x6, int x7)
-{
-    return state_ += x1+x2+x3+x4+x5+x6+x7;
-}
-
-int f8(int & state_, int x1, int x2, int x3, int x4, int x5, int x6, int x7, int x8)
-{
-    return state_ += x1+x2+x3+x4+x5+x6+x7+x8;
-}
-
-template<class F> void test(F f, int a, int b)
-{
-    BOOST_TEST( f() == a +   b );
-    BOOST_TEST( f() == a + 2*b );
-    BOOST_TEST( f() == a + 3*b );
-}
-
-void stateful_function_object_test()
-{
-    test( boost::bind<int>( X() ), 0, 17041 );
-    test( boost::bind<int>( X(), 1 ), 0, 1 );
-    test( boost::bind<int>( X(), 1, 2 ), 0, 1+2 );
-    test( boost::bind<int>( X(), 1, 2, 3 ), 0, 1+2+3 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4 ), 0, 1+2+3+4 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4, 5 ), 0, 1+2+3+4+5 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4, 5, 6 ), 0, 1+2+3+4+5+6 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4, 5, 6, 7 ), 0, 1+2+3+4+5+6+7 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4, 5, 6, 7, 8 ), 0, 1+2+3+4+5+6+7+8 );
-    test( boost::bind<int>( X(), 1, 2, 3, 4, 5, 6, 7, 8, 9 ), 0, 1+2+3+4+5+6+7+8+9 );
-
-    X x;
-
-    int n = x.state();
-
-    test( boost::bind<int>( boost::ref(x) ), n, 17041 );
-    n += 3*17041;
-
-    test( boost::bind<int>( boost::ref(x), 1 ), n, 1 );
-    n += 3*1;
-
-    test( boost::bind<int>( boost::ref(x), 1, 2 ), n, 1+2 );
-    n += 3*(1+2);
-
-    test( boost::bind<int>( boost::ref(x), 1, 2, 3 ), n, 1+2+3 );
-    n += 3*(1+2+3);
-
-    test( boost::bind<int>( boost::ref(x), 1, 2, 3, 4 ), n, 1+2+3+4 );
-    n += 3*(1+2+3+4);
-
-    test( boost::bind<int>( boost::ref(x), 1, 2, 3, 4, 5 ), n, 1+2+3+4+5 );
-    n += 3*(1+2+3+4+5);
-
-    test( boost::bind<int>( boost::ref(x), 1, 2, 3, 4, 5, 6 ), n, 1+2+3+4+5+6 );
-    n += 3*(1+2+3+4+5+6);
-
-    test( boost::bind<int>( boost::ref(x), 1, 2, 3, 4, 5, 6, 7 ), n, 1+2+3+4+5+6+7 );
-    n += 3*(1+2+3+4+5+6+7);
-
-    test( boost::bind<int>( boost::ref(x), 1, 2, 3, 4, 5, 6, 7, 8 ), n, 1+2+3+4+5+6+7+8 );
-    n += 3*(1+2+3+4+5+6+7+8);
-
-    test( boost::bind<int>( boost::ref(x), 1, 2, 3, 4, 5, 6, 7, 8, 9 ), n, 1+2+3+4+5+6+7+8+9 );
-    n += 3*(1+2+3+4+5+6+7+8+9);
-
-    BOOST_TEST( x.state() == n );
-}
-
-void stateful_function_test()
-{
-    test( boost::bind( f0, 0 ), 0, 17041 );
-    test( boost::bind( f1, 0, 1 ), 0, 1 );
-    test( boost::bind( f2, 0, 1, 2 ), 0, 1+2 );
-    test( boost::bind( f3, 0, 1, 2, 3 ), 0, 1+2+3 );
-    test( boost::bind( f4, 0, 1, 2, 3, 4 ), 0, 1+2+3+4 );
-    test( boost::bind( f5, 0, 1, 2, 3, 4, 5 ), 0, 1+2+3+4+5 );
-    test( boost::bind( f6, 0, 1, 2, 3, 4, 5, 6 ), 0, 1+2+3+4+5+6 );
-    test( boost::bind( f7, 0, 1, 2, 3, 4, 5, 6, 7 ), 0, 1+2+3+4+5+6+7 );
-    test( boost::bind( f8, 0, 1, 2, 3, 4, 5, 6, 7, 8 ), 0, 1+2+3+4+5+6+7+8 );
-}
-
-int main()
-{
-    stateful_function_object_test();
-    stateful_function_test();
-    return boost::report_errors();
-}
--- a/test/bind_stdcall_mf_test.cpp
+++ b/test/bind_stdcall_mf_test.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #define BOOST_MEM_FN_ENABLE_STDCALL
--- a/test/bind_stdcall_test.cpp
+++ b/test/bind_stdcall_test.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #define BOOST_BIND_ENABLE_STDCALL
--- a/test/bind_test.cpp
+++ b/test/bind_test.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -13,9 +11,10 @@
 //  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
 //  Copyright (c) 2001 David Abrahams
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #include <boost/bind.hpp>
@@ -189,7 +188,7 @@ void function_object_test()
    BOOST_TEST( bind<int>(Y(), i, _1)(k) == 38 );
    BOOST_TEST( bind<long>(Y(), i, _1, 9)(k) == 938 );

-#if !defined(__MWERKS__) || (__MWERKS__ > 0x2407)     // Fails for this version of the compiler.
+#if !defined(__MWERKS__) || (__MWERKS__ > 0x2406)     // Fails for this version of the compiler.

    global_result = 0;
    bind<void>(Y(), i, _1, 9, 4)(k);
@@ -390,7 +389,7 @@ void member_function_test()
    bind(&X::g8, x, 1, 2, 3, 4, 5, 6, 7, 8)();
    bind(&X::g8, ref(x), 1, 2, 3, 4, 5, 6, 7, 8)();

-    BOOST_TEST( x.hash == 23558 );
+    BOOST_TEST( bind(&X::hash, _1)(x) == 23558 );
 }

 void member_function_void_test()
@@ -480,7 +479,7 @@ void member_function_void_test()
    bind(&V::g8, v, 1, 2, 3, 4, 5, 6, 7, 8)();
    bind(&V::g8, ref(v), 1, 2, 3, 4, 5, 6, 7, 8)();

-    BOOST_TEST( v.hash == 23558 );
+    BOOST_TEST( bind(&V::hash, _1)(v) == 23558 );
 }

 void nested_bind_test()
--- a/test/bind_unary_addr.cpp
+++ b/test/bind_unary_addr.cpp
@@ -1,147 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  bind_unary_addr.cpp
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-class X
-{
-private:
-
-    void operator& ();
-    void operator& () const;
-
-public:
-
-    void operator()()
-    {
-    }
-
-    void operator()() const
-    {
-    }
-
-    void operator()(int)
-    {
-    }
-
-    void operator()(int) const
-    {
-    }
-
-    void operator()(int, int)
-    {
-    }
-
-    void operator()(int, int) const
-    {
-    }
-
-    void operator()(int, int, int)
-    {
-    }
-
-    void operator()(int, int, int) const
-    {
-    }
-
-    void operator()(int, int, int, int)
-    {
-    }
-
-    void operator()(int, int, int, int) const
-    {
-    }
-
-    void operator()(int, int, int, int, int)
-    {
-    }
-
-    void operator()(int, int, int, int, int) const
-    {
-    }
-
-    void operator()(int, int, int, int, int, int)
-    {
-    }
-
-    void operator()(int, int, int, int, int, int) const
-    {
-    }
-
-    void operator()(int, int, int, int, int, int, int)
-    {
-    }
-
-    void operator()(int, int, int, int, int, int, int) const
-    {
-    }
-
-    void operator()(int, int, int, int, int, int, int, int)
-    {
-    }
-
-    void operator()(int, int, int, int, int, int, int, int) const
-    {
-    }
-
-    void operator()(int, int, int, int, int, int, int, int, int)
-    {
-    }
-
-    void operator()(int, int, int, int, int, int, int, int, int) const
-    {
-    }
-};
-
-template<class F> void test_const( F const & f )
-{
-    f();
-}
-
-template<class F> void test( F f )
-{
-    f();
-    test_const( f );
-}
-
-int main()
-{
-    test( boost::bind<void>( X() ) );
-    test( boost::bind<void>( X(), 1 ) );
-    test( boost::bind<void>( X(), 1, 2 ) );
-    test( boost::bind<void>( X(), 1, 2, 3 ) );
-    test( boost::bind<void>( X(), 1, 2, 3, 4 ) );
-    test( boost::bind<void>( X(), 1, 2, 3, 4, 5 ) );
-    test( boost::bind<void>( X(), 1, 2, 3, 4, 5, 6 ) );
-    test( boost::bind<void>( X(), 1, 2, 3, 4, 5, 6, 7 ) );
-    test( boost::bind<void>( X(), 1, 2, 3, 4, 5, 6, 7, 8 ) );
-    test( boost::bind<void>( X(), 1, 2, 3, 4, 5, 6, 7, 8, 9 ) );
-
-    return 0;
-}
--- a/test/bind_visit_test.cpp
+++ b/test/bind_visit_test.cpp
@@ -1,67 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-# pragma warning(disable: 4786)  // identifier truncated in debug info
-# pragma warning(disable: 4710)  // function not inlined
-# pragma warning(disable: 4711)  // function selected for automatic inline expansion
-# pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-// Copyright (c) 2006 Douglas Gregor <doug.gregor@gmail.com>
-// Copyright (c) 2006 Peter Dimov
-//
-// 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/bind.hpp>
-#include <boost/visit_each.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-# pragma warning(push, 3)
-#endif
-
-#include <iostream>
-#include <typeinfo>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-# pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-struct visitor
-{
-    int hash;
-
-    visitor(): hash( 0 )
-    {
-    }
-
-    template<typename T> void operator()( T const & t )
-    {
-        std::cout << "visitor::operator()( T ): " << typeid( t ).name() << std::endl;
-    }
-
-    void operator()( int const & t )
-    {
-        std::cout << "visitor::operator()( int ): " << t << std::endl;
-        hash = hash * 10 + t;
-    }
-};
-
-int f( int x, int y, int z )
-{
-    return x + y + z;
-}
-
-int main()
-{
-    visitor vis;
-
-    boost::visit_each( vis, boost::bind( f, 3, _1, 4 ) );
-
-    BOOST_TEST( vis.hash == 34 );
-
-    return boost::report_errors();
-}
--- a/test/mem_fn_cdecl_test.cpp
+++ b/test/mem_fn_cdecl_test.cpp
@@ -1,186 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  mem_fn_cdecl_test.cpp - a test for mem_fn.hpp + __cdecl
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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_MEM_FN_ENABLE_CDECL
-
-#include <boost/mem_fn.hpp>
-#include <boost/shared_ptr.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-
-struct X
-{
-    mutable unsigned int hash;
-
-    X(): hash(0) {}
-
-    int __cdecl f0() { f1(17); return 0; }
-    int __cdecl g0() const { g1(17); return 0; }
-
-    int __cdecl f1(int a1) { hash = (hash * 17041 + a1) % 32768; return 0; }
-    int __cdecl g1(int a1) const { hash = (hash * 17041 + a1 * 2) % 32768; return 0; }
-
-    int __cdecl f2(int a1, int a2) { f1(a1); f1(a2); return 0; }
-    int __cdecl g2(int a1, int a2) const { g1(a1); g1(a2); return 0; }
-
-    int __cdecl f3(int a1, int a2, int a3) { f2(a1, a2); f1(a3); return 0; }
-    int __cdecl g3(int a1, int a2, int a3) const { g2(a1, a2); g1(a3); return 0; }
-
-    int __cdecl f4(int a1, int a2, int a3, int a4) { f3(a1, a2, a3); f1(a4); return 0; }
-    int __cdecl g4(int a1, int a2, int a3, int a4) const { g3(a1, a2, a3); g1(a4); return 0; }
-
-    int __cdecl f5(int a1, int a2, int a3, int a4, int a5) { f4(a1, a2, a3, a4); f1(a5); return 0; }
-    int __cdecl g5(int a1, int a2, int a3, int a4, int a5) const { g4(a1, a2, a3, a4); g1(a5); return 0; }
-
-    int __cdecl f6(int a1, int a2, int a3, int a4, int a5, int a6) { f5(a1, a2, a3, a4, a5); f1(a6); return 0; }
-    int __cdecl g6(int a1, int a2, int a3, int a4, int a5, int a6) const { g5(a1, a2, a3, a4, a5); g1(a6); return 0; }
-
-    int __cdecl f7(int a1, int a2, int a3, int a4, int a5, int a6, int a7) { f6(a1, a2, a3, a4, a5, a6); f1(a7); return 0; }
-    int __cdecl g7(int a1, int a2, int a3, int a4, int a5, int a6, int a7) const { g6(a1, a2, a3, a4, a5, a6); g1(a7); return 0; }
-
-    int __cdecl f8(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) { f7(a1, a2, a3, a4, a5, a6, a7); f1(a8); return 0; }
-    int __cdecl g8(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) const { g7(a1, a2, a3, a4, a5, a6, a7); g1(a8); return 0; }
-};
-
-int detect_errors(bool x)
-{
-    if(x)
-    {
-        std::cerr << "no errors detected.\n";
-        return 0;
-    }
-    else
-    {
-        std::cerr << "test failed.\n";
-        return 1;
-    }
-}
-
-int main()
-{
-    using boost::mem_fn;
-
-    X x;
-
-    X const & rcx = x;
-    X const * pcx = &x;
-
-    boost::shared_ptr<X> sp(new X);
-
-    mem_fn(&X::f0)(x);
-    mem_fn(&X::f0)(&x);
-    mem_fn(&X::f0)(sp);
-
-    mem_fn(&X::g0)(x);
-    mem_fn(&X::g0)(rcx);
-    mem_fn(&X::g0)(&x);
-    mem_fn(&X::g0)(pcx);
-    mem_fn(&X::g0)(sp);
-
-    mem_fn(&X::f1)(x, 1);
-    mem_fn(&X::f1)(&x, 1);
-    mem_fn(&X::f1)(sp, 1);
-
-    mem_fn(&X::g1)(x, 1);
-    mem_fn(&X::g1)(rcx, 1);
-    mem_fn(&X::g1)(&x, 1);
-    mem_fn(&X::g1)(pcx, 1);
-    mem_fn(&X::g1)(sp, 1);
-
-    mem_fn(&X::f2)(x, 1, 2);
-    mem_fn(&X::f2)(&x, 1, 2);
-    mem_fn(&X::f2)(sp, 1, 2);
-
-    mem_fn(&X::g2)(x, 1, 2);
-    mem_fn(&X::g2)(rcx, 1, 2);
-    mem_fn(&X::g2)(&x, 1, 2);
-    mem_fn(&X::g2)(pcx, 1, 2);
-    mem_fn(&X::g2)(sp, 1, 2);
-
-    mem_fn(&X::f3)(x, 1, 2, 3);
-    mem_fn(&X::f3)(&x, 1, 2, 3);
-    mem_fn(&X::f3)(sp, 1, 2, 3);
-
-    mem_fn(&X::g3)(x, 1, 2, 3);
-    mem_fn(&X::g3)(rcx, 1, 2, 3);
-    mem_fn(&X::g3)(&x, 1, 2, 3);
-    mem_fn(&X::g3)(pcx, 1, 2, 3);
-    mem_fn(&X::g3)(sp, 1, 2, 3);
-
-    mem_fn(&X::f4)(x, 1, 2, 3, 4);
-    mem_fn(&X::f4)(&x, 1, 2, 3, 4);
-    mem_fn(&X::f4)(sp, 1, 2, 3, 4);
-
-    mem_fn(&X::g4)(x, 1, 2, 3, 4);
-    mem_fn(&X::g4)(rcx, 1, 2, 3, 4);
-    mem_fn(&X::g4)(&x, 1, 2, 3, 4);
-    mem_fn(&X::g4)(pcx, 1, 2, 3, 4);
-    mem_fn(&X::g4)(sp, 1, 2, 3, 4);
-
-    mem_fn(&X::f5)(x, 1, 2, 3, 4, 5);
-    mem_fn(&X::f5)(&x, 1, 2, 3, 4, 5);
-    mem_fn(&X::f5)(sp, 1, 2, 3, 4, 5);
-
-    mem_fn(&X::g5)(x, 1, 2, 3, 4, 5);
-    mem_fn(&X::g5)(rcx, 1, 2, 3, 4, 5);
-    mem_fn(&X::g5)(&x, 1, 2, 3, 4, 5);
-    mem_fn(&X::g5)(pcx, 1, 2, 3, 4, 5);
-    mem_fn(&X::g5)(sp, 1, 2, 3, 4, 5);
-
-    mem_fn(&X::f6)(x, 1, 2, 3, 4, 5, 6);
-    mem_fn(&X::f6)(&x, 1, 2, 3, 4, 5, 6);
-    mem_fn(&X::f6)(sp, 1, 2, 3, 4, 5, 6);
-
-    mem_fn(&X::g6)(x, 1, 2, 3, 4, 5, 6);
-    mem_fn(&X::g6)(rcx, 1, 2, 3, 4, 5, 6);
-    mem_fn(&X::g6)(&x, 1, 2, 3, 4, 5, 6);
-    mem_fn(&X::g6)(pcx, 1, 2, 3, 4, 5, 6);
-    mem_fn(&X::g6)(sp, 1, 2, 3, 4, 5, 6);
-
-    mem_fn(&X::f7)(x, 1, 2, 3, 4, 5, 6, 7);
-    mem_fn(&X::f7)(&x, 1, 2, 3, 4, 5, 6, 7);
-    mem_fn(&X::f7)(sp, 1, 2, 3, 4, 5, 6, 7);
-
-    mem_fn(&X::g7)(x, 1, 2, 3, 4, 5, 6, 7);
-    mem_fn(&X::g7)(rcx, 1, 2, 3, 4, 5, 6, 7);
-    mem_fn(&X::g7)(&x, 1, 2, 3, 4, 5, 6, 7);
-    mem_fn(&X::g7)(pcx, 1, 2, 3, 4, 5, 6, 7);
-    mem_fn(&X::g7)(sp, 1, 2, 3, 4, 5, 6, 7);
-
-    mem_fn(&X::f8)(x, 1, 2, 3, 4, 5, 6, 7, 8);
-    mem_fn(&X::f8)(&x, 1, 2, 3, 4, 5, 6, 7, 8);
-    mem_fn(&X::f8)(sp, 1, 2, 3, 4, 5, 6, 7, 8);
-
-    mem_fn(&X::g8)(x, 1, 2, 3, 4, 5, 6, 7, 8);
-    mem_fn(&X::g8)(rcx, 1, 2, 3, 4, 5, 6, 7, 8);
-    mem_fn(&X::g8)(&x, 1, 2, 3, 4, 5, 6, 7, 8);
-    mem_fn(&X::g8)(pcx, 1, 2, 3, 4, 5, 6, 7, 8);
-    mem_fn(&X::g8)(sp, 1, 2, 3, 4, 5, 6, 7, 8);
-
-    return detect_errors(x.hash == 17610 && sp->hash == 2155);
-}
--- a/test/mem_fn_derived_test.cpp
+++ b/test/mem_fn_derived_test.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #include <boost/mem_fn.hpp>
--- a/test/mem_fn_dm_test.cpp
+++ b/test/mem_fn_dm_test.cpp
@@ -1,67 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  mem_fn_dm_test.cpp - data members
-//
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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/mem_fn.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-struct X
-{
-    int m;
-};
-
-int main()
-{
-    X x = { 0 };
-
-    boost::mem_fn( &X::m )( x ) = 401;
-
-    BOOST_TEST( x.m == 401 );
-    BOOST_TEST( boost::mem_fn( &X::m )( x ) == 401 );
-
-    boost::mem_fn( &X::m )( &x ) = 502;
-
-    BOOST_TEST( x.m == 502 );
-    BOOST_TEST( boost::mem_fn( &X::m )( &x ) == 502 );
-
-    X * px = &x;
-
-    boost::mem_fn( &X::m )( px ) = 603;
-
-    BOOST_TEST( x.m == 603 );
-    BOOST_TEST( boost::mem_fn( &X::m )( px ) == 603 );
-
-    X const & cx = x;
-    X const * pcx = &x;
-
-    BOOST_TEST( boost::mem_fn( &X::m )( cx ) == 603 );
-    BOOST_TEST( boost::mem_fn( &X::m )( pcx ) == 603 );
-
-    return boost::report_errors();
-}
--- a/test/mem_fn_eq_test.cpp
+++ b/test/mem_fn_eq_test.cpp
@@ -1,300 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  mem_fn_eq_test.cpp - boost::mem_fn equality operator
-//
-//  Copyright (c) 2004 Peter Dimov
-//
-// 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/mem_fn.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
-struct X
-{
-    int dm_1;
-    int dm_2;
-
-    // 0
-
-    int mf0_1() { return 0; }
-    int mf0_2() { return 0; }
-
-    int cmf0_1() const { return 0; }
-    int cmf0_2() const { return 0; }
-
-    void mf0v_1() {}
-    void mf0v_2() {}
-
-    void cmf0v_1() const {}
-    void cmf0v_2() const {}
-
-    // 1
-
-    int mf1_1(int) { return 0; }
-    int mf1_2(int) { return 0; }
-
-    int cmf1_1(int) const { return 0; }
-    int cmf1_2(int) const { return 0; }
-
-    void mf1v_1(int) {}
-    void mf1v_2(int) {}
-
-    void cmf1v_1(int) const {}
-    void cmf1v_2(int) const {}
-
-    // 2
-
-    int mf2_1(int, int) { return 0; }
-    int mf2_2(int, int) { return 0; }
-
-    int cmf2_1(int, int) const { return 0; }
-    int cmf2_2(int, int) const { return 0; }
-
-    void mf2v_1(int, int) {}
-    void mf2v_2(int, int) {}
-
-    void cmf2v_1(int, int) const {}
-    void cmf2v_2(int, int) const {}
-
-    // 3
-
-    int mf3_1(int, int, int) { return 0; }
-    int mf3_2(int, int, int) { return 0; }
-
-    int cmf3_1(int, int, int) const { return 0; }
-    int cmf3_2(int, int, int) const { return 0; }
-
-    void mf3v_1(int, int, int) {}
-    void mf3v_2(int, int, int) {}
-
-    void cmf3v_1(int, int, int) const {}
-    void cmf3v_2(int, int, int) const {}
-
-    // 4
-
-    int mf4_1(int, int, int, int) { return 0; }
-    int mf4_2(int, int, int, int) { return 0; }
-
-    int cmf4_1(int, int, int, int) const { return 0; }
-    int cmf4_2(int, int, int, int) const { return 0; }
-
-    void mf4v_1(int, int, int, int) {}
-    void mf4v_2(int, int, int, int) {}
-
-    void cmf4v_1(int, int, int, int) const {}
-    void cmf4v_2(int, int, int, int) const {}
-
-    // 5
-
-    int mf5_1(int, int, int, int, int) { return 0; }
-    int mf5_2(int, int, int, int, int) { return 0; }
-
-    int cmf5_1(int, int, int, int, int) const { return 0; }
-    int cmf5_2(int, int, int, int, int) const { return 0; }
-
-    void mf5v_1(int, int, int, int, int) {}
-    void mf5v_2(int, int, int, int, int) {}
-
-    void cmf5v_1(int, int, int, int, int) const {}
-    void cmf5v_2(int, int, int, int, int) const {}
-
-    // 6
-
-    int mf6_1(int, int, int, int, int, int) { return 0; }
-    int mf6_2(int, int, int, int, int, int) { return 0; }
-
-    int cmf6_1(int, int, int, int, int, int) const { return 0; }
-    int cmf6_2(int, int, int, int, int, int) const { return 0; }
-
-    void mf6v_1(int, int, int, int, int, int) {}
-    void mf6v_2(int, int, int, int, int, int) {}
-
-    void cmf6v_1(int, int, int, int, int, int) const {}
-    void cmf6v_2(int, int, int, int, int, int) const {}
-
-    // 7
-
-    int mf7_1(int, int, int, int, int, int, int) { return 0; }
-    int mf7_2(int, int, int, int, int, int, int) { return 0; }
-
-    int cmf7_1(int, int, int, int, int, int, int) const { return 0; }
-    int cmf7_2(int, int, int, int, int, int, int) const { return 0; }
-
-    void mf7v_1(int, int, int, int, int, int, int) {}
-    void mf7v_2(int, int, int, int, int, int, int) {}
-
-    void cmf7v_1(int, int, int, int, int, int, int) const {}
-    void cmf7v_2(int, int, int, int, int, int, int) const {}
-
-    // 8
-
-    int mf8_1(int, int, int, int, int, int, int, int) { return 0; }
-    int mf8_2(int, int, int, int, int, int, int, int) { return 0; }
-
-    int cmf8_1(int, int, int, int, int, int, int, int) const { return 0; }
-    int cmf8_2(int, int, int, int, int, int, int, int) const { return 0; }
-
-    void mf8v_1(int, int, int, int, int, int, int, int) {}
-    void mf8v_2(int, int, int, int, int, int, int, int) {}
-
-    void cmf8v_1(int, int, int, int, int, int, int, int) const {}
-    void cmf8v_2(int, int, int, int, int, int, int, int) const {}
-
-};
-
-int main()
-{
-    BOOST_TEST( boost::mem_fn(&X::dm_1) == boost::mem_fn(&X::dm_1) );
-    BOOST_TEST( boost::mem_fn(&X::dm_1) != boost::mem_fn(&X::dm_2) );
-
-    // 0
-
-    BOOST_TEST( boost::mem_fn(&X::mf0_1) == boost::mem_fn(&X::mf0_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf0_1) != boost::mem_fn(&X::mf0_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf0_1) == boost::mem_fn(&X::cmf0_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf0_1) != boost::mem_fn(&X::cmf0_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::mf0v_1) == boost::mem_fn(&X::mf0v_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf0v_1) != boost::mem_fn(&X::mf0v_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf0v_1) == boost::mem_fn(&X::cmf0v_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf0v_1) != boost::mem_fn(&X::cmf0v_2) );
-
-    // 1
-
-    BOOST_TEST( boost::mem_fn(&X::mf1_1) == boost::mem_fn(&X::mf1_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf1_1) != boost::mem_fn(&X::mf1_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf1_1) == boost::mem_fn(&X::cmf1_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf1_1) != boost::mem_fn(&X::cmf1_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::mf1v_1) == boost::mem_fn(&X::mf1v_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf1v_1) != boost::mem_fn(&X::mf1v_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf1v_1) == boost::mem_fn(&X::cmf1v_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf1v_1) != boost::mem_fn(&X::cmf1v_2) );
-
-    // 2
-
-    BOOST_TEST( boost::mem_fn(&X::mf2_1) == boost::mem_fn(&X::mf2_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf2_1) != boost::mem_fn(&X::mf2_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf2_1) == boost::mem_fn(&X::cmf2_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf2_1) != boost::mem_fn(&X::cmf2_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::mf2v_1) == boost::mem_fn(&X::mf2v_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf2v_1) != boost::mem_fn(&X::mf2v_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf2v_1) == boost::mem_fn(&X::cmf2v_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf2v_1) != boost::mem_fn(&X::cmf2v_2) );
-
-    // 3
-
-    BOOST_TEST( boost::mem_fn(&X::mf3_1) == boost::mem_fn(&X::mf3_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf3_1) != boost::mem_fn(&X::mf3_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf3_1) == boost::mem_fn(&X::cmf3_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf3_1) != boost::mem_fn(&X::cmf3_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::mf3v_1) == boost::mem_fn(&X::mf3v_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf3v_1) != boost::mem_fn(&X::mf3v_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf3v_1) == boost::mem_fn(&X::cmf3v_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf3v_1) != boost::mem_fn(&X::cmf3v_2) );
-
-    // 4
-
-    BOOST_TEST( boost::mem_fn(&X::mf4_1) == boost::mem_fn(&X::mf4_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf4_1) != boost::mem_fn(&X::mf4_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf4_1) == boost::mem_fn(&X::cmf4_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf4_1) != boost::mem_fn(&X::cmf4_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::mf4v_1) == boost::mem_fn(&X::mf4v_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf4v_1) != boost::mem_fn(&X::mf4v_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf4v_1) == boost::mem_fn(&X::cmf4v_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf4v_1) != boost::mem_fn(&X::cmf4v_2) );
-
-    // 5
-
-    BOOST_TEST( boost::mem_fn(&X::mf5_1) == boost::mem_fn(&X::mf5_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf5_1) != boost::mem_fn(&X::mf5_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf5_1) == boost::mem_fn(&X::cmf5_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf5_1) != boost::mem_fn(&X::cmf5_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::mf5v_1) == boost::mem_fn(&X::mf5v_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf5v_1) != boost::mem_fn(&X::mf5v_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf5v_1) == boost::mem_fn(&X::cmf5v_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf5v_1) != boost::mem_fn(&X::cmf5v_2) );
-
-    // 6
-
-    BOOST_TEST( boost::mem_fn(&X::mf6_1) == boost::mem_fn(&X::mf6_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf6_1) != boost::mem_fn(&X::mf6_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf6_1) == boost::mem_fn(&X::cmf6_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf6_1) != boost::mem_fn(&X::cmf6_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::mf6v_1) == boost::mem_fn(&X::mf6v_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf6v_1) != boost::mem_fn(&X::mf6v_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf6v_1) == boost::mem_fn(&X::cmf6v_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf6v_1) != boost::mem_fn(&X::cmf6v_2) );
-
-    // 7
-
-    BOOST_TEST( boost::mem_fn(&X::mf7_1) == boost::mem_fn(&X::mf7_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf7_1) != boost::mem_fn(&X::mf7_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf7_1) == boost::mem_fn(&X::cmf7_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf7_1) != boost::mem_fn(&X::cmf7_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::mf7v_1) == boost::mem_fn(&X::mf7v_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf7v_1) != boost::mem_fn(&X::mf7v_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf7v_1) == boost::mem_fn(&X::cmf7v_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf7v_1) != boost::mem_fn(&X::cmf7v_2) );
-
-    // 8
-
-    BOOST_TEST( boost::mem_fn(&X::mf8_1) == boost::mem_fn(&X::mf8_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf8_1) != boost::mem_fn(&X::mf8_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf8_1) == boost::mem_fn(&X::cmf8_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf8_1) != boost::mem_fn(&X::cmf8_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::mf8v_1) == boost::mem_fn(&X::mf8v_1) );
-    BOOST_TEST( boost::mem_fn(&X::mf8v_1) != boost::mem_fn(&X::mf8v_2) );
-
-    BOOST_TEST( boost::mem_fn(&X::cmf8v_1) == boost::mem_fn(&X::cmf8v_1) );
-    BOOST_TEST( boost::mem_fn(&X::cmf8v_1) != boost::mem_fn(&X::cmf8v_2) );
-
-
-    return boost::report_errors();
-}
--- a/test/mem_fn_fastcall_test.cpp
+++ b/test/mem_fn_fastcall_test.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #define BOOST_MEM_FN_ENABLE_FASTCALL
--- a/test/mem_fn_rv_test.cpp
+++ b/test/mem_fn_rv_test.cpp
@@ -1,117 +0,0 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
-#pragma warning(disable: 4786)  // identifier truncated in debug info
-#pragma warning(disable: 4710)  // function not inlined
-#pragma warning(disable: 4711)  // function selected for automatic inline expansion
-#pragma warning(disable: 4514)  // unreferenced inline removed
-#endif
-
-//
-//  mem_fn_test.cpp - mem_fn.hpp with rvalues
-//
-//  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
-//  Copyright (c) 2005 Peter Dimov
-//
-// 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/mem_fn.hpp>
-#include <boost/shared_ptr.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-unsigned int hash = 0;
-
-struct X
-{
-    int f0() { f1(17); return 0; }
-    int g0() const { g1(17); return 0; }
-
-    int f1(int a1) { hash = (hash * 17041 + a1) % 32768; return 0; }
-    int g1(int a1) const { hash = (hash * 17041 + a1 * 2) % 32768; return 0; }
-
-    int f2(int a1, int a2) { f1(a1); f1(a2); return 0; }
-    int g2(int a1, int a2) const { g1(a1); g1(a2); return 0; }
-
-    int f3(int a1, int a2, int a3) { f2(a1, a2); f1(a3); return 0; }
-    int g3(int a1, int a2, int a3) const { g2(a1, a2); g1(a3); return 0; }
-
-    int f4(int a1, int a2, int a3, int a4) { f3(a1, a2, a3); f1(a4); return 0; }
-    int g4(int a1, int a2, int a3, int a4) const { g3(a1, a2, a3); g1(a4); return 0; }
-
-    int f5(int a1, int a2, int a3, int a4, int a5) { f4(a1, a2, a3, a4); f1(a5); return 0; }
-    int g5(int a1, int a2, int a3, int a4, int a5) const { g4(a1, a2, a3, a4); g1(a5); return 0; }
-
-    int f6(int a1, int a2, int a3, int a4, int a5, int a6) { f5(a1, a2, a3, a4, a5); f1(a6); return 0; }
-    int g6(int a1, int a2, int a3, int a4, int a5, int a6) const { g5(a1, a2, a3, a4, a5); g1(a6); return 0; }
-
-    int f7(int a1, int a2, int a3, int a4, int a5, int a6, int a7) { f6(a1, a2, a3, a4, a5, a6); f1(a7); return 0; }
-    int g7(int a1, int a2, int a3, int a4, int a5, int a6, int a7) const { g6(a1, a2, a3, a4, a5, a6); g1(a7); return 0; }
-
-    int f8(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) { f7(a1, a2, a3, a4, a5, a6, a7); f1(a8); return 0; }
-    int g8(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) const { g7(a1, a2, a3, a4, a5, a6, a7); g1(a8); return 0; }
-};
-
-int detect_errors(bool x)
-{
-    if( x )
-    {
-        std::cerr << "no errors detected.\n";
-        return 0;
-    }
-    else
-    {
-        std::cerr << "test failed.\n";
-        return 1;
-    }
-}
-
-boost::shared_ptr<X> make()
-{
-    return boost::shared_ptr<X>( new X );
-}
-
-int main()
-{
-    using boost::mem_fn;
-
-    mem_fn(&X::f0)( make() );
-    mem_fn(&X::g0)( make() );
-
-    mem_fn(&X::f1)( make(), 1 );
-    mem_fn(&X::g1)( make(), 1 );
-
-    mem_fn(&X::f2)( make(), 1, 2 );
-    mem_fn(&X::g2)( make(), 1, 2 );
-
-    mem_fn(&X::f3)( make(), 1, 2, 3 );
-    mem_fn(&X::g3)( make(), 1, 2, 3 );
-
-    mem_fn(&X::f4)( make(), 1, 2, 3, 4 );
-    mem_fn(&X::g4)( make(), 1, 2, 3, 4 );
-
-    mem_fn(&X::f5)( make(), 1, 2, 3, 4, 5 );
-    mem_fn(&X::g5)( make(), 1, 2, 3, 4, 5 );
-
-    mem_fn(&X::f6)( make(), 1, 2, 3, 4, 5, 6 );
-    mem_fn(&X::g6)( make(), 1, 2, 3, 4, 5, 6 );
-
-    mem_fn(&X::f7)( make(), 1, 2, 3, 4, 5, 6, 7 );
-    mem_fn(&X::g7)( make(), 1, 2, 3, 4, 5, 6, 7 );
-
-    mem_fn(&X::f8)( make(), 1, 2, 3, 4, 5, 6, 7, 8 );
-    mem_fn(&X::g8)( make(), 1, 2, 3, 4, 5, 6, 7, 8 );
-
-    return detect_errors( hash == 2155 );
-}
--- a/test/mem_fn_stdcall_test.cpp
+++ b/test/mem_fn_stdcall_test.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #define BOOST_MEM_FN_ENABLE_STDCALL
--- a/test/mem_fn_test.cpp
+++ b/test/mem_fn_test.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #include <boost/mem_fn.hpp>
--- a/test/mem_fn_void_test.cpp
+++ b/test/mem_fn_void_test.cpp
@@ -1,6 +1,4 @@
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC)
+#if defined(_MSC_VER) && !defined(__ICL)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
 #pragma warning(disable: 4710)  // function not inlined
 #pragma warning(disable: 4711)  // function selected for automatic inline expansion
@@ -12,9 +10,10 @@
 //
 //  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
 //
-// 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)
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
 //

 #include <boost/mem_fn.hpp>
Author	SHA1	Message	Date
Rene Rivera	082266a9a5	Cleanup release tags. [SVN r44252]	2008-04-12 03:40:20 +00:00
nobody	eca90dd715	This commit was manufactured by cvs2svn to create tag 'Version_1_30_1'. [SVN r19444]	2003-08-04 17:55:29 +00:00
Douglas Gregor	b32ebea99c	Make this a forwarding header to the BoostBook-generated documentation [SVN r17738]	2003-03-05 16:26:01 +00:00
nobody	5454a5aac6	This commit was manufactured by cvs2svn to create branch 'RC_1_30_0'. [SVN r17693]	2003-03-01 19:43:06 +00:00