This commit was manufactured by cvs2svn to create tag

'Version_1_30_2'. [SVN r19685]
Stupid fix, from mainline
2025-06-25 20:11:37 +02:00 · 2003-08-18 18:40:31 +00:00 · 2003-08-08 22:15:43 +00:00 · 2003-07-18 04:04:54 +00:00 · 2003-07-18 04:00:02 +00:00 · 2003-03-01 19:43:06 +00:00
43 changed files with 1587 additions and 1935 deletions
--- a/doc/faq.html
+++ b/doc/faq.html
@ -1,44 +0,0 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
  <head>
    <title>Boost.Function Frequently Asked Questions</title>
  </head>
  <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080">
 <h1><IMG SRC="../../../c++boost.gif" WIDTH="276" HEIGHT="86">boost::function Frequently Asked Questions</h1>
 <h2>Q: I see void pointers; is this [mess] type safe?</h2>
 <p>Yes, <code>boost::function</code> is type safe even though it uses void pointers and pointers to functions returning void and taking no arguments. Essentially, all type information is encoded in the functions that manage and invoke function pointers and function objects. Only these functions are instantiated with the exact type that is pointed to by the void pointer or pointer to void function. The reason that both are required is that one may cast between void pointers and object pointers safely or between different types of function pointers (provided you don't invoke a function pointer with the wrong type). 
 <h2>Q: Why are there workarounds for void returns? C++ allows them!</h2>
 <p>Void returns are permitted by the C++ standard, as in this code snippet:
 <pre>
 void f();
 void g() { return f(); }
 </pre>
 <p> One reason for not using void returns is that not all compilers support them. In fact, very few compilers seem to support this trivial feature. Additionally, <code>boost::function</code> is more flexible because it does not use void returns. Consider the following code:
 <pre>
 int do_something(int);
 boost::function<void, int> f;
 f = do_something;
 </pre>
 <p> This is a valid usage of <code>boost::function</code> because void returns are not used. With void returns, we would attempting to compile ill-formed code similar to:
 <pre>
 int f();
 void g() { return f(); }
 </pre>
 <p> In essence, not using void returns allows <code>boost::function</code> to swallow a return value. This is consistent with allowing the user to assign and invoke functions and function objects with parameters that don't exactly match.
 <h2>Q: Why (function) cloning? </h2>
 <p> In November and December of 2000, the issue of cloning vs. reference counting was debated at length and it was decided that cloning gave more predictable semantics. I won't rehash the discussion here, but if it cloning is incorrect for a particular application a reference-counting allocator could be used. 
    <hr>
    <address><a href="mailto:gregod@cs.rpi.edu">Doug Gregor</a></address>
 <!-- Created: Fri Feb 16 09:30:41 EST 2001 -->
 <!-- hhmts start -->
 Last modified: Wed Nov  7 15:11:52 EST 2001
 <!-- hhmts end -->
  </body>
 </html>
--- a/doc/reference.html
+++ b/doc/reference.html
@ -1,299 +0,0 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
  <head>
    <title>Boost.Function Reference Manual</title>
  </head>
  <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080">
  <h1><IMG SRC="../../../c++boost.gif" WIDTH="276" HEIGHT="86">Boost.Function Reference Manual</h1>
 <h2><a name="header">Header <code>&lt;<a href="../../../boost/function.hpp">boost/function.hpp</a>&gt;</code> synopsis</a></h2>
 <p> Here <code><i>MAX_ARGS</i></code> is an implementation-defined constant that defines the maximum number of function arguments supported by Boost.Function and will be at least 10. The <code><i>MAX_ARGS</i></code> constant referred to in this document need not have any direct representation in the library.
 <pre>
 <b>namespace</b> boost {
  <b>class</b> <a href="#function_base">function_base</a>
  {
    <b>typedef</b> <em>implementation-defined</em> safe_bool;
    <a href="#empty"><b>bool</b> empty() <b>const</b></a>;
    <a href="#bool"><b>operator</b> safe_bool() <b>const</b></a>;
    <a href="#not">safe_bool <b>operator!</b>() <b>const</b></a>;
  };
  // For <i>N</i> in [0, <i>MAX_ARGS</i>]
  <b>template</b>&lt;<b>typename</b> ResultType,
           <b>typename</b> Arg1,
 	   <b>typename</b> Arg2,
           <i>...</i>
           <b>typename</b> Arg<i>N</i>,
 	   <b>typename</b> Policy    = empty_function_policy,
 	   <b>typename</b> Mixin     = empty_function_mixin,
 	   <b>typename</b> Allocator = std::allocator&lt;function_base&gt; &gt;
  <b>class</b> <a href="#functionN">function<i>N</i></a> : <b>public</b> <a href="#function_base">function_base</a>, <b>public</b> Mixin
  {
    <b>typedef</b> ResultType result_type; <em>// <a href="#novoid">[1]</a></em>
    <b>typedef</b> Policy     policy_type;
    <b>typedef</b> Mixin      mixin_type;
    <b>typedef</b> Allocator  allocator_type;
    <b>typedef</b> Arg1 argument_type;        <i>// If N == 1</i>
    <b>typedef</b> Arg1 first_argument_type;  <i>// If N == 2</i>
    <b>typedef</b> Arg2 second_argument_type; <i>// If N == 2</i>
    <i>// Construction</i>
    <a href="#functionN_default"><b>explicit</b> function<i>N</i>(<b>const</b> Mixin<b>&amp;</b> = Mixin())</a>;
    <a href="#functionN_copy">function<i>N</i>(<b>const</b> function<i>N</i><b>&amp;</b>)</a>;
    <a href="#functionN_target"><b>template</b>&lt;<b>typename</b> F&gt; function<i>N</i>(F, <b>const</b> Mixin<b>&amp;</b> = Mixin())</a>;
    <a href="#functionN_target_ref"><b>template</b>&lt;<b>typename</b> F&gt; function<i>N</i>(reference_wrapper&lt;F&gt;)</a>;
    <i>// Assignment</i>
    <a href="#functionN_copy_assn">function<i>N</i><b>&amp;</b> <b>operator</b>=(<b>const</b> function<i>N</i><b>&amp;</b>)</a>;
    <a href="#functionN_target_assn"><b>template</b>&lt;<b>typename</b> F&gt; function<i>N</i><b>&amp;</b> <b>operator</b>=(F)</a>;
    <a href="#functionN_target_ref_assn"><b>template</b>&lt;<b>typename</b> F&gt; function<i>N</i><b>&amp;</b> <b>operator</b>=(reference_wrapper&lt;F&gt;)</a>;
    <a href="#functionN_copy_set"><b>void</b> set(<b>const</b> function<i>N</i><b>&amp;</b>)</a>;
    <a href="#functionN_target_set"><b>template</b>&lt;<b>typename</b> F&gt; <b>void</b> set(F)</a>;
    <a href="#functionN_swap"><b>void</b> swap(function<i>N</i><b>&amp;</b>)</a>;
    <a href="#functionN_clear"><b>void</b> clear()</a>;
    <i>// Invocation</i>
    <a href="#functionN_call_const">result_type <b>operator</b>()(Arg1 a1, Arg2 a2, <i>...</i>, Arg<i>N</i> a<i>N</i>) <b>const</b></a>;
  };
  <b>template</b>&lt;<b>typename</b> ResultType,
           <b>typename</b> Arg1,
 	   <b>typename</b> Arg2,
           <i>...</i>
 	   <b>typename</b> Arg<i>N</i>,
           <b>typename</b> Policy,
           <b>typename</b> Mixin,
           <b>typename</b> Allocator&gt;
  <b>void</b> <a href="#swap_functionN">swap</a>(function<em>N</em>&lt;ResultType, Arg1, Arg2, <i>...</i>, Arg<i>N</i>, Policy, Mixin, Allocator&gt;<b>&amp;</b>,
            function<em>N</em>&lt;ResultType, Arg1, Arg2, <i>...</i>, Arg<i>N</i>, Policy, Mixin, Allocator&gt;<b>&amp;</b>);
  // For any <i>N</i> in [0, <i>MAX_ARGS</i>]
  <b>template</b>&lt;<b>typename</b> ResultType,
           <b>typename</b> Arg1,
 	   <b>typename</b> Arg2,
           <i>...</i>
           <b>typename</b> Arg<i>N</i>,
           <b>typename</b> Arg<i>N+1</i> = <i>implementation-defined</i>,
           <b>typename</b> Arg<i>N+2</i> = <i>implementation-defined</i>,
 	   <i>...</i>
 	   <b>typename</b> Arg<i>MAX_ARGS</i> = <i>implementation-defined</i>&gt;
  <b>class</b> <a href="#function">function</a> : <b>public</b> <a href="#functionN">function<i>N</i></a>&lt;ResultType, Arg1, Arg2, <i>...</i>, Arg<i>N</i>&gt;
  {
    <i>// Construction</i>
    function();
    function(<b>const</b> function<b>&amp;</b>);
    function(<b>const</b> function<i>N</i>&lt;ResultType, Arg1, Arg2, ..., Arg<i>N</i>&gt;<b>&amp;</b>);
    <b>template</b>&lt;<b>typename</b> F&gt; function<i>N</i>(F);
    <i>// Assignment</i>
    function<b>&amp;</b> <b>operator</b>=(<b>const</b> function<b>&amp;</b>);
    function<b>&amp;</b> <b>operator</b>=(<b>const</b> function<i>N</i>&lt;ResultType, Arg1, Arg2, ..., Arg<i>N</i>&gt;<b>&amp;</b>);
    <b>template</b>&lt;<b>typename</b> F&gt; function<b>&amp;</b> <b>operator</b>=(F);
    <b>void</b> set(<b>const</b> function<b>&amp;</b>);
    <b>void</b> set(<b>const</b> function<i>N</i>&lt;ResultType, Arg1, Arg2, ..., Arg<i>N</i>&gt;<b>&amp;</b>);
    <b>template</b>&lt;<b>typename</b> F&gt; <b>void</b> set(F);
  };
  <b>template</b>&lt;<b>typename</b> ResultType,
           <b>typename</b> Arg1,
 	   <b>typename</b> Arg2,
           <i>...</i>
 	   <b>typename</b> Arg<i>MAX_ARGS</i>&gt;
  <b>void</b> <a href="#swap_function">swap</a>(function&lt;ResultType, Arg1, Arg2, <i>...</i>, Arg<i>MAX_ARGS</i>&gt;<b>&amp;</b>,
            function&lt;ResultType, Arg1, Arg2, <i>...</i>, Arg<i>MAX_ARGS</i>&gt;<b>&amp;</b>);
 }	   
 </pre>
 <h2>Definitions</h2>
 <p>
 <ul>
  <li><a name="compatible"></a>A function object <code>f</code> is <em>compatible</em> if for the given set of argument types <code>Arg1</code>, <code>Arg2</code>, ..., <code>Arg<em>N</em></code> and a return type <code>ResultType</code>, the appropriate following function is well-formed:
 <pre>
  <em>// if ResultType is not <b>void</b></em>
  ResultType foo(Arg1 arg1, Arg2 arg2, ..., Arg<em>N</em> arg<em>N</em>)
  {
    <b>return</b> f(arg1, arg2, ..., arg<em>N</em>);
  }
  <em>// if ResultType is <b>void</b></em>
  ResultType foo(Arg1 arg1, Arg2 arg2, ..., Arg<em>N</em> arg<em>N</em>)
  {
    f(arg1, arg2, ..., arg<em>N</em>);
  }
 </pre>
        <p> A special provision is made for pointers to member functions. Though they are not function objects, Boost.Function will adapt them internally to function objects. This requires that a pointer to member function of the form <code>R (X::*mf)(Arg1, Arg2, ..., Arg<em>N</em>) <em>cv-quals</em></code> be adapted to a function object with the following function call operator overloads:
 <pre>
  <b>template</b>&lt;<b>typename P</b>&gt;
  R <b>operator</b>()(<em>cv-quals</em> P&amp; x, Arg1 arg1, Arg2 arg2, ..., Arg<em>N</em> arg<em>N</em>) <b>const</b>
  {
    <b>return</b> (*x).*mf(arg1, arg2, ..., arg<em>N</em>);
  }
 </pre>
  <li><a name="stateless"></a>A function object <code>f</code> of type <code>F</code> is <em>stateless</em> if it is a function pointer or if <a href="../../type_traits/index.htm#properties"><code>boost::is_stateless&lt;T&gt;</code></a> is true. The construction of or copy to a Boost.Function object from a stateless function object will not cause exceptions to be thrown and will not allocate any storage.</li>
 </ul>
 <h2><a name="function_base">Class <code>function_base</code></a></h2>
 <p> Class <code>function_base</code> is the common base class for all Boost.Function objects. Objects of type <code>function_base</code> may not be created directly. 
 <p> <a name="empty"><code><b>bool</b> empty() <b>const</b></code></a>
 <ul>
  <li><b>Returns</b>: <code>true</code> if the function object has a target, <code>false</code> otherwise.</li>
  <li><b>Throws</b>: will not throw.</li>
 </ul>
 <p> <a name="bool"><code><b>operator</b> safe_bool() <b>const</b></code></a>
 <ul>
  <li><b>Returns</b>: <code>safe_bool</code> equivalent of <code>!<a href="#empty">empty</a>()</code></li>
  <li><b>Throws</b>: will not throw.</li>
  <li><b>Notes</b>: The <code>safe_bool</code> type can be used in contexts where a <b>bool</b> is expected (e.g., an <b>if</b> condition); however, implicit conversions (e.g., to <b>int</b>) that can occur with <b>bool</b> are not allowed, eliminating some sources of user error.
 </ul>
 <p> <a name="not"><code>safe_bool <b>operator!</b>() <b>const</b></code></a>
 <ul>
  <li><b>Returns</b>: <code>safe_bool</code> equivalent of <code><a href="#empty">empty</a>()</code></li>
  <li><b>Throws</b>: will not throw.</li>
  <li><b>Notes</b>: See <a href="#bool"><code>safe_bool</code> conversion</a>
 </ul>
 <h2><a name="functionN">Class template <code>function<i>N</i></code></a></h2>
 <p> Class template <code>function<i>N</i></code> is actually a family of related classes <code>function0</code>, <code>function1</code>, etc., up to some implementation-defined maximum. In this context, <code><i>N</i></code> refers to the number of parameters and <code>f</code> refers to the implicit object parameter.
 <p> <a name="functionN_default"><code><b>explicit</b> function<i>N</i>(<b>const</b> Mixin<b>&amp;</b> = Mixin());</code></a>
 <ul>
  <li><b>Effects</b>: Constructs the <code>Mixin</code> subobject with the given mixin.</li>
  <li><b>Postconditions</b>: <code>f.<a href="#empty">empty</a>()</code>.</li>
  <li><b>Throws</b>: will not throw unless construction of the <code>Mixin</code> subobject throws.</li>
 </ul>
 <p> <a name="functionN_copy"><code>function<i>N</i>(<b>const</b> function<i>N</i><b>&amp;</b> g);</code></a>
 <ul>
  <li><b>Postconditions</b>: <code>f</code> contains a copy of the <code>g</code>'s target, if it has one, or is empty if <code>g.<a href="#empty">empty</a>()</code>. The mixin for the <code>f</code> is copy-constructed from the mixin of <code>g</code>.</li>
  <li><b>Throws</b>: will not throw unless copying the target of <code>g</code> or construction of the <code>Mixin</code> subobject throws.</li>
 </ul>
 <p> <a name="functionN_target"><code><b>template</b>&lt;<b>typename</b> F&gt; function<i>N</i>(F g, <b>const</b> Mixin<b>&amp;</b> = Mixin());</code></a>
 <ul>
  <li><b>Requires</b>: <code>g</code> is a <a href="#compatible">compatible</a> function object.</li>
  <li><b>Effects</b>: Constructs the <code>Mixin</code> subobject from the given mixin.</li>
  <li><b>Postconditions</b>: <code>f</code> targets a copy of <code>g</code> if <code>g</code> is nonempty, or <code>f.<a href="#empty">empty</a>()</code> if <code>g</code> is empty.</li>
  <li><b>Throws</b>: will not throw when <code>g</code> is a <a href="#stateless">stateless</a> function object unless construction of the <code>Mixin</code> subobject throws.</li>
 </ul>
 <p> <a name="functionN_target_ref"><code><b>template</b>&lt;<b>typename</b> F&gt; function<i>N</i>(<a href="../../bind/ref.html">reference_wrapper</a>&lt;F&gt; g);</code></a>
 <ul>
  <li><b>Requires</b>: <code>g.get()</code> is a <a href="#compatible">compatible</a> function object.</li>
  <li><b>Effects</b>: Constructs the <code>Mixin</code> subobject from the given mixin.</li>
  <li><b>Postconditions</b>: <code>this</code> object targets <code>g</code> (<em>not</em> a copy of <code>g.get()</code>) if <code>g.get()</code> is nonempty, or <code>this-&gt;empty()</code> if <code>g.get()</code> is empty.</li>
  <li><b>Throws</b>: will not throw unless the construction of the <code>Mixin</code> subobject throws.</li>
 </ul>
 <p> <a name="functionN_copy_assn"><code>function<i>N</i><b>&amp;</b> <b>operator</b>=(<b>const</b> function<i>N</i><b>&amp;</b> g);</code></a>
 <ul>
  <li><b>Postconditions</b>: <code>f</code> targets a copy of <code>g</code>'s target, if it has one, or is empty if <code>g.<a href="#empty">empty</a>()</code>. The mixin for <code>f</code> is assigned the value of the mixin for <code>g</code>.</li>
  <li><b>Returns</b>: <code>*this</code>.</li>
  <li><b>Throws</b>: will not throw when the target of <code>g</code> is a <a href="#stateless">stateless</a> function object or a reference to the function object, unless the copy of the <code>Mixin</code> subobject throws.</li>
 </ul>
 <p> <a name="functionN_target_assn"><code><b>template</b>&lt;<b>typename</b> F&gt; function<i>N</i><b>&amp;</b> <b>operator</b>=(F g);</code></a>
 <ul>
  <li><b>Requires</b>: <code>g</code> is a <a href="#compatible">compatible</a> function object.</li>
  <li><b>Postconditions</b>: <code>f</code> targets a copy of <code>g</code> if <code>g</code> is nonempty, or <code>f.<a href="#empty">empty</a>()</code> if <code>g</code> is empty.</li>
  <li><b>Returns</b>: <code>*this</code>.</li>
  <li><b>Throws</b>: will not throw when <code>g</code> is a <a href="#stateless">stateless</a> function object.</li>
 </ul>
 <p> <a name="functionN_target_ref_assn"><code><b>template</b>&lt;<b>typename</b> F&gt; function<i>N</i><b>&amp;</b> <b>operator</b>=(<a href="../../bind/ref.html">reference_wrapper</a>&lt;F&gt; g);</code></a>
 <ul>
  <li><b>Requires</b>: <code>g.get()</code> is a <a href="#compatible">compatible</a> function object.</li>
  <li><b>Postconditions</b>: <code>f</code> targets <code>g.get()</code> (not a copy of <code>g.get()</code>) if <code>g.get()</code> is nonempty, or <code>f.<a href="#empty">empty</a>()</code> if <code>g.get()</code> is empty.</li>
  <li><b>Returns</b>: <code>*this</code>.</li>
  <li><b>Throws</b>: will throw only if the destruction or deallocation of the target of <code>this</code> throws.</li>
 </ul>
 <p> <a name="functionN_copy_set"><code><b>void</b> set(<b>const</b> function<i>N</i><b>&amp;</b> g);</code></a>
 <ul>
  <li><b>Effects</b>: <code><a href="#functionN_copy_assn">*this = g</a></code>.</li>
 </ul>
 <p> <a name="functionN_target_set"><code><b>template</b>&lt;<b>typename</b> F&gt; <b>void</b> set(F g);</code></a>
 <ul>
  <li><b>Effects</b>: <code><a href="#functionN_target_assn">*this = g</a></code>.</li>
 </ul>
 <p> <a name="functionN_swap"><code><b>void</b> swap(function<i>N</i><b>&amp;</b> g);</code></a>
 <ul>
  <li><b>Effects</b>: interchanges the targets of <code>f</code> and <code>g</code> and swaps the mixins of <code>f</code> and <code>g</code>.</li>
  <li><b>Throws</b>: will not throw.</li>
 </ul>
 <p> <a name="functionN_clear"><code><b>void</b> clear(); </code></a>
 <ul>
  <li><b>Effects</b>: If <code>!<a href="#empty">empty</a>()</code>, deallocates current target.</li>
  <li><b>Postconditions</b>: <code><a href="#empty">empty</a>()</code>.</li>
 </ul>
 <p> <a name="functionN_call_const"><code> result_type <b>operator</b>()(Arg1 a1, Arg2 a2, <i>...</i>, Arg<i>N</i> a<i>N</i>) <b>const</b>;</code></a>
 <ul>
  <li><b>Requires</b>: <code>!<a href="#empty">empty</a>()</code>.</li>
  <li><b>Effects</b>: <i>target</i> is the underlying function target. It is not <code><b>const</b></code> or <code><b>volatile</b></code> qualified.
    <ol>
      <li><code>policy_type policy;</code></li>
      <li><code>policy.precall(this);</code></li>
      <li><code><i>target</i>(a1, a2, <i>...</i>, a<i>N</i>);</code></li>
      <li><code>policy.postcall(this);</code></li>
    </ol>
  <li><b>Returns</b>: the value returned by <i>target</i>.</li>
 </ul>
 <h2><a name="function">Class template <code>function</code></a></h2>
 <p> Class template <code>function</code> is a thin wrapper around the numbered class templates <code>function0</code>, <code>function1</code>, etc. It accepts up to <i>MAX_ARGS</i> arguments, but when passed <i>N</i> arguments it will derive from <code>function<i>N</i></code> specialized with the arguments it receives.
 <p> The semantics of all operations in class template <code>function</code> are equivalent to that of the underlying <code>function<i>N</i></code> object, although additional member functions are required to allow proper copy construction and copy assignment of <code>function</code> objects.
 <h2><a name="operations">Operations</a></h2>
 <p>
 <pre>
 <b>template</b>&lt;<b>typename</b> ResultType,
         <b>typename</b> Arg1,
 	 <b>typename</b> Arg2,
         <i>...</i>
 	 <b>typename</b> Arg<i>N</i>,
         <b>typename</b> Policy,
         <b>typename</b> Mixin,
         <b>typename</b> Allocator&gt;
 <b>void</b> <a name="swap_functionN">swap</a>(function<i>N</i>&lt;ResultType, Arg1, Arg2, <i>...</i>, Arg<i>N</i>, Policy, Mixin, Allocator&gt;<b>&amp;</b> f,
          function<i>N</i>&lt;ResultType, Arg1, Arg2, <i>...</i>, Arg<i>N</i>, Policy, Mixin, Allocator&gt;<b>&amp;</b> g);
 </pre>
 <ul>
  <li><b>Effects</b>: <code>f.<a href="#functionN_swap">swap</a>(g);</code></li>
 </ul>
 <p>
 <pre>
 <b>template</b>&lt;<b>typename</b> ResultType,
         <b>typename</b> Arg1,
 	 <b>typename</b> Arg2,
         <i>...</i>
 	 <b>typename</b> Arg<i>MAX_ARGS</i>&gt;
 <b>void</b> <a name="swap_function">swap</a>(function&lt;ResultType, Arg1, Arg2, <i>...</i>, Arg<i>MAX_ARGS</i>&gt;<b>&amp;</b> f,
          function&lt;ResultType, Arg1, Arg2, <i>...</i>, Arg<i>MAX_ARGS</i>&gt;<b>&amp;</b> g);
 </pre>
 <ul>
  <li><b>Effects</b>: <code>f.<a href="#functionN_swap">swap</a>(g);</code></li>
 </ul>
    <hr>
 <p><a name="novoid">[1]</a> On compilers not supporting void returns, when the <code>ReturnType</code> is <b>void</b>, the <code>result_type</code> of a Boost.Function object is implementation-defined.
    <hr>
    <address><a href="mailto:gregod@cs.rpi.edu">Douglas Gregor</a></address>
 <!-- Created: Fri Jul 13 10:57:20 EDT 2001 -->
 <!-- hhmts start -->
 Last modified: Thu Jan 31 21:55:35 EST 2002
 <!-- hhmts end -->
  </body>
 </html>
--- a/doc/tutorial.html
+++ b/doc/tutorial.html
@ -1,205 +0,0 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
  <head>
    <title>Boost.Function Tutorial</title>
  </head>
  <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080">
    <h1><IMG SRC="../../../c++boost.gif" WIDTH="276" HEIGHT="86">Boost.Function Tutorial</h1>
 <h2><a name="usage">Basic usage</a></h2>
 <p> A function wrapper is defined simply by instantiating the <code>function</code> class template with the desired return type and argument types. Any number of arguments may be supplied, up to some implementation-defined limit (10 is the default maximum). The following declares a function object wrapper <code>f</code> that takes two <code>int</code> parameters and returns a <code>float</code>:
 <pre>
 boost::<a href="reference.html#function">function</a>&lt;float, int, int&gt; f;
 </pre>
 <p> By default, function object wrappers are empty, so we can create a 
 function object to assign to <code>f</code>:
 <pre>
 struct int_div { 
  float operator()(int x, int y) const { return ((float)x)/y; }; 
 };
 f = int_div();
 </pre>
 <p> Now we can use <code>f</code> to execute the underlying function object
 <code>int_div</code>:
 <pre>
 std::cout << f(5, 3) << std::endl;
 </pre>
 <p> We are free to assign any compatible function object to <code>f</code>. If <code>int_div</code> had been declared to take two <code>long</code> operands,
 the implicit conversions would have been applied to the arguments without any user interference. The only limit on the types of arguments is that they be CopyConstructible, so we can even use references and arrays:
 <pre>
 boost::function&lt;void, int[], int, int&, float&&gt; sum_avg;
 void do_sum_avg(int values[], int n, int& sum, float&amp; avg)
 {
  sum = 0;
  for (int i = 0; i < n; i++)
    sum += values[i];
  avg = (float)sum / n;
 }
 sum_avg = &do_sum_avg;
 </pre>
 <p> Invoking a function object wrapper that does not actually contain a function object is a precondition violation, much like trying to call through a null function pointer. We can check for an empty function object wrapper by querying its <code><a href="reference.html#empty">empty</a>()</code> method or, more succinctly, by using it in a boolean context: if it evaluates true, it contains a function object target, i.e.,
 <pre>
 if (f)
  std::cout << f(5, 3) << std::endl;
 else
  std::cout << "f has no target, so it is unsafe to call" << std::endl;
 </pre>
 <p> We can clear out a function target using the <code><a href="reference.html#functionN_clear">clear</a>()</code> member function.
 <h3>Free functions</h3>
 <p> Free function pointers can be considered singleton function objects with const function call operators, and can therefore be directly used with the function object wrappers:
 <pre>
  float mul_ints(int x, int y) { return ((float)x) * y; }
  f = &amp;mul_ints;
 </pre>
 <p> Note that the <code>&amp;</code> isn't really necessary unless you happen to be using Microsoft Visual C++ version 6.
 <h3>Member functions</h3>
 <a name="member_func">
 <p> In many systems, callbacks often call to member functions of a particular
 object. This is often referred to as "argument binding", and is beyond the scope of Boost.Function. The use of member functions directly, however, is supported, so the following code is valid:
 <pre>
  struct X {
    int foo(int);
  };
  boost::function&lt;int, X*, int&gt; f;
  f = &amp;X::foo;
  X x;
  f(&amp;x, 5);
 </pre>
 <p> Several libraries exist that support argument binding. Three such libraries are summarized below:
 <ul>
  <li> <a href="../../bind/bind.html">Boost.Bind</a>. This library allows binding of arguments for any function object. It is lightweight and very portable.</li>
  <li> The C++ Standard library. Using <code>std::bind1st</code> and <code>std::mem_fun</code> together one can bind the object of a pointer-to-member function for use with Boost.Function:
 <pre>
  struct X {
    int foo(int);
  };
  boost::function&lt;int, int&gt; f;
  X x;
  f = std::bind1st(std::mem_fun(&X::foo), &x);
  f(5); // Call x.foo(5)</pre></li>
  <li><a href="http://lambda.cs.utu.fi/">The Lambda library</a>. This library provides a powerful composition mechanism to construct function objects that uses very natural C++ syntax. Lambda requires a compiler that is reasonably conformant to the C++ standard. Note that it is not a Boost library.</li>
 </ul>
 <h3>References to Functions</h3>
 <p> In some cases it is expensive (or semantically incorrect) to have
 Boost.Function clone a function object. In such cases, it is possible
 to request that Boost.Function keep only a reference to the actual
 function object. This is done using the <a
 href="../../bind/ref.html"><code>ref</code></a> and <a
 href="../../bind/ref.html"><code>cref</code></a> functions to wrap a
 reference to a function object:
 <pre>
  stateful_type a_function_object;
  boost::function&lt;int, int&gt; f;
  f = ref(a_function_object);
  boost::function&lt;int, int&gt; f2(f);
 </pre>
 Here, <code>f</code> will not make a copy of
 <code>a_function_object</code>, nor will <code>f2</code> when it is
 targeted to <code>f</code>'s reference to
 <code>a_function_object</code>. Additionally, when using references to
 function objects, Boost.Function will not throw exceptions during
    assignment or construction.
 <h2><a name="family">The <code>function</code> family</a></h2>
 <p> The header &lt;<a href="../../../boost/function.hpp">boost/function.hpp</a>&gt; defines the primary entry point to the function object wrappers, the class template <code>boost::function</code>. This class template is essentially a thin wrapper around a set of similar numbered function object wrappers, <code>boost::function0</code>, <code>boost::function1</code>, etc., where the number indicates the number of arguments passed to the function object target. The declaration of <code>f</code> above could also be written as:
 <pre>
 boost::function2&lt;float, int, int&gt; f;
 </pre>
 <p> The numbered class templates contain most of the implementation and are each distinct class templates. They may be helpful if used in shared libraries, where the number of arguments supported by Boost.Function may change between revisions. Additionally, some compilers (e.g., Microsoft Visual C++ 6.0) have been known to be incapable of compiling <code>boost::function</code> in some instances but are able to handle the numbered variants.
 <h2><a name="advanced">Advanced usage</a></h2>
 <p> The <code>boost::function</code> family supports additional customization by means of policies, mixins, and allocators. The specific usage of each of these will be explained in later sections, but they share a common problem: how to replace each default with your own version. 
 <p> With <code>boost::function</code> it is not so clear, because support for an arbitrary number of parameters means that it is impossible to specify just the last parameter, but not 5 of the parameters in between. Therefore, <code>boost::function</code> doubles as a generative interface for the underlying numbered class templates that uses named template parameters. For instance, to specify both a policy and an allocator for a function object wrapper <code>f</code> taking an <code>int</code> and returning an <code>int</code>, use:
 <pre>
  function&lt;int, int&gt;::policy&lt;MyPolicy&gt;::allocator&lt;MyAllocator&gt;::type f;
 </pre>
 <p> The named template parameters <code>policy</code>, <code>mixin</code> and <code>allocator</code> each take one template parameter (the replacement class) and may be nested as above to generate a function object wrapper. The <code>::type</code> at the end accesses the actual type that fits the given properties.
 <h3><a name="policies">Policies</a></h3>
 <p> Policies define what happens directly before and directly after an invocation of a function object target is made. A policy must have two member functions, <code>precall</code> and <code>postcall</code>, each of which must be able to accept a <code>const</code> function object wrapper pointer. The following policy will print "before" prior to execution and "after" afterwards:
 <pre>
 struct print_policy {
  void precall(const boost::function_base*) { std::cout << "before"; }
  void postcall(const boost::function_base*) { std::cout << "after"; }
 };
 </pre>
 <p> A new instance of the policy class will be created prior to calling the function object target and will be preserved until after the call has returned. Therefore, for any invocation the <code>precall</code> and <code>postcall</code> will be executed on the same policy class instance; however, policy class instances will not be kept between target invocations.
 <p> Policies are further <a href="../../../more/generic_programming.html#policy">described</a> in the Boost discussion on <a href="../../../more/generic_programming.html">generic programming techniques</a>.
 <h3><a name="mixins">Mixins</a></h3>
 <p> The function object wrappers allow any class to be "mixed in" as a base class. This allows extra members and/or functionality to be included by the user. This can be used, for instance, to overcome the limitations of policies by storing data between invocations in a base class instead of in a <code>static</code> member of a policy class. 
 <h3><a name="allocators">Allocators</a></h3>
 <p> The function object wrappers allow the user to specify a new allocator to handle the cloning of function object targets (when the wrappers are copied). The allocators used are the same as the C++ standard library allocators. The wrappers assume the allocators are stateless, and will create a new instance each time they are used (because they are rebound very often). This shares the semantics of most standard library implementations, and is explicitly allowed by the C++ standard.
 <h3><a name="synchronizing">Example: Synchronized callbacks</a></h3>
 <p> Synchronization of callbacks in a multithreaded environment is extremely important. Using mixins and policies, a Boost.Function object may implement its own synchronization policy that ensures that only one thread can be in the callback function at any given point in time.
 <p> We will use the prototype Boost.Threads library for its <code>recursive_mutex</code>. Since the mutex is on a per-callback basis, we will add a mutex to the <code>boost::function</code> by mixin it in with this mixin class:
 <pre>
 class SynchronizedMixin {
  mutable boost::recursive_mutex mutex;
 };
 </pre>
 <p> Next, we create a policy that obtains a lock before the target is called (via the <code>precall</code> function) and releases the lock after the target has been called (via the <code>postcall</code> function):
 <pre>
 class SynchronizedPolicy {
  std::auto_ptr&lt;boost::recursive_mutex::lock&gt; lock;
  void precall(const SynchronizedMixin* f) 
  {
    lock.reset(new boost::recursive_mutex::lock(f->mutex));
  }
  void postcall(const SynchronizedMixin* f)
  {
    lock.reset();
  }
 };
 </pre>
 <p>The use of <code>std::auto_ptr</code> ensures that the lock will be destroyed (and therefore released) if an exception is thrown by the target function. Now we can use the policy and mixin together to create a synchronized callback:
 <pre>
 boost::function2&lt;float, int, int, SynchronizedPolicy, SynchronizedMixin&gt; f;
 </pre>
    <hr>
    <address><a href="mailto:gregod@cs.rpi.edu">Douglas Gregor</a></address>
 <!-- Created: Fri Jul 13 12:47:11 EDT 2001 -->
 <!-- hhmts start -->
 Last modified: Fri Dec 14 19:58:14 EST 2001
 <!-- hhmts end -->
  </body>
 </html>
--- a/include/boost/function.hpp
+++ b/include/boost/function.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2001, 2002 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,508 +10,61 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
-// For more information, see http://www.boost.org
+// For more information, see http://www.boost.org/libs/function
- 
+
 // William Kempf, Jesse Jones and Karl Nelson were all very helpful in the
 // design of this library.
-#ifndef BOOST_FUNCTION_HPP
+#include <boost/preprocessor/iterate.hpp>
-#define BOOST_FUNCTION_HPP
+#include <boost/detail/workaround.hpp>
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_MAX_ARGS
-#include <boost/function/function0.hpp>
+#  define BOOST_FUNCTION_MAX_ARGS 10
-#include <boost/function/function1.hpp>
+#endif // BOOST_FUNCTION_MAX_ARGS
 #include <boost/function/function2.hpp>
 #include <boost/function/function3.hpp>
 #include <boost/function/function4.hpp>
 #include <boost/function/function5.hpp>
 #include <boost/function/function6.hpp>
 #include <boost/function/function7.hpp>
 #include <boost/function/function8.hpp>
 #include <boost/function/function9.hpp>
 #include <boost/function/function10.hpp>
-namespace boost {
+// Include the prologue here so that the use of file-level iteration
-  namespace detail {
+// in anything that may be included by function_template.hpp doesn't break
-    namespace function {
+#include <boost/function/detail/prologue.hpp>
      // Choose the appropriate underlying implementation
      template<int Args> struct real_get_function_impl {};
-      template<>
+// Visual Age C++ doesn't handle the file iteration well
-      struct real_get_function_impl<0>
+#if BOOST_WORKAROUND(__IBMCPP__, <= 600)
-      {
+#  if BOOST_FUNCTION_MAX_ARGS >= 0
-        template<
+#    include <boost/function/function0.hpp>
-          typename R, 
+#  endif
-          typename T1,
+#  if BOOST_FUNCTION_MAX_ARGS >= 1
-          typename T2,
+#    include <boost/function/function1.hpp>
-          typename T3,
+#  endif
-          typename T4,
+#  if BOOST_FUNCTION_MAX_ARGS >= 2
-          typename T5,
+#    include <boost/function/function2.hpp>
-          typename T6,
+#  endif
-          typename T7,
+#  if BOOST_FUNCTION_MAX_ARGS >= 3
-          typename T8,
+#    include <boost/function/function3.hpp>
-          typename T9,
+#  endif
-          typename T10,
+#  if BOOST_FUNCTION_MAX_ARGS >= 4
-          typename Policy,
+#    include <boost/function/function4.hpp>
-          typename Mixin,
+#  endif
-          typename Allocator
+#  if BOOST_FUNCTION_MAX_ARGS >= 5
-        >
+#    include <boost/function/function5.hpp>
-        struct params
+#  endif
-        {
+#  if BOOST_FUNCTION_MAX_ARGS >= 6
-          typedef function0<R, Policy, Mixin, Allocator> type;
+#    include <boost/function/function6.hpp>
-        };
+#  endif
-      };
+#  if BOOST_FUNCTION_MAX_ARGS >= 7
-
+#    include <boost/function/function7.hpp>
-      template<>
+#  endif
-      struct real_get_function_impl<1>
+#  if BOOST_FUNCTION_MAX_ARGS >= 8
-      {
+#    include <boost/function/function8.hpp>
-        template<
+#  endif
-          typename R, 
+#  if BOOST_FUNCTION_MAX_ARGS >= 9
-          typename T1,
+#    include <boost/function/function9.hpp>
-          typename T2,
+#  endif
-          typename T3,
+#  if BOOST_FUNCTION_MAX_ARGS >= 10
-          typename T4,
+#    include <boost/function/function10.hpp>
-          typename T5,
+#  endif
          typename T6,
          typename T7,
          typename T8,
          typename T9,
          typename T10,
          typename Policy,
          typename Mixin,
          typename Allocator
        >
        struct params
        {
          typedef function1<R, T1, Policy, Mixin, Allocator> type;
        };
      };
      template<>
      struct real_get_function_impl<2>
      {
        template<
          typename R, 
          typename T1,
          typename T2,
          typename T3,
          typename T4,
          typename T5,
          typename T6,
          typename T7,
          typename T8,
          typename T9,
          typename T10,
          typename Policy,
          typename Mixin,
          typename Allocator
        >
        struct params
        {
          typedef function2<R, T1, T2, Policy, Mixin, Allocator> type;
        };
      };
      template<>
      struct real_get_function_impl<3>
      {
        template<
          typename R, 
          typename T1,
          typename T2,
          typename T3,
          typename T4,
          typename T5,
          typename T6,
          typename T7,
          typename T8,
          typename T9,
          typename T10,
          typename Policy,
          typename Mixin,
          typename Allocator
        >
        struct params
        {
          typedef function3<R, T1, T2, T3, Policy, Mixin, Allocator> type;
        };
      };
      template<>
      struct real_get_function_impl<4>
      {
        template<
          typename R, 
          typename T1,
          typename T2,
          typename T3,
          typename T4,
          typename T5,
          typename T6,
          typename T7,
          typename T8,
          typename T9,
          typename T10,
          typename Policy,
          typename Mixin,
          typename Allocator
        >
        struct params
        {
          typedef function4<R, T1, T2, T3, T4, Policy, Mixin, Allocator> type;
        };
      };
      template<>
      struct real_get_function_impl<5>
      {
        template<
          typename R, 
          typename T1,
          typename T2,
          typename T3,
          typename T4,
          typename T5,
          typename T6,
          typename T7,
          typename T8,
          typename T9,
          typename T10,
          typename Policy,
          typename Mixin,
          typename Allocator
        >
        struct params
        {
          typedef function5<R, T1, T2, T3, T4, T5, Policy, Mixin, Allocator> 
          type;
        };
      };
      template<>
      struct real_get_function_impl<6>
      {
        template<
          typename R, 
          typename T1,
          typename T2,
          typename T3,
          typename T4,
          typename T5,
          typename T6,
          typename T7,
          typename T8,
          typename T9,
          typename T10,
          typename Policy,
          typename Mixin,
          typename Allocator
        >
        struct params
        {
          typedef function6<R, T1, T2, T3, T4, T5, T6, Policy, Mixin, Allocator>
          type;
        };
      };
      template<>
      struct real_get_function_impl<7>
      {
        template<
          typename R, 
          typename T1,
          typename T2,
          typename T3,
          typename T4,
          typename T5,
          typename T6,
          typename T7,
          typename T8,
          typename T9,
          typename T10,
          typename Policy,
          typename Mixin,
          typename Allocator
        >
        struct params
        {
          typedef function7<R, T1, T2, T3, T4, T5, T6, T7, Policy, Mixin, 
                            Allocator> type;
        };
      };
      template<>
      struct real_get_function_impl<8>
      {
        template<
          typename R, 
          typename T1,
          typename T2,
          typename T3,
          typename T4,
          typename T5,
          typename T6,
          typename T7,
          typename T8,
          typename T9,
          typename T10,
          typename Policy,
          typename Mixin,
          typename Allocator
        >
        struct params
        {
          typedef function8<R, T1, T2, T3, T4, T5, T6, T7, T8, Policy, Mixin, 
                            Allocator> type;
        };
      };
      template<>
      struct real_get_function_impl<9>
      {
        template<
          typename R, 
          typename T1,
          typename T2,
          typename T3,
          typename T4,
          typename T5,
          typename T6,
          typename T7,
          typename T8,
          typename T9,
          typename T10,
          typename Policy,
          typename Mixin,
          typename Allocator
        >
        struct params
        {
          typedef function9<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, Policy, 
                            Mixin, Allocator> type;
        };
      };
      template<>
      struct real_get_function_impl<10>
      {
        template<
          typename R, 
          typename T1,
          typename T2,
          typename T3,
          typename T4,
          typename T5,
          typename T6,
          typename T7,
          typename T8,
          typename T9,
          typename T10,
          typename Policy,
          typename Mixin,
          typename Allocator
        >
        struct params
        {
          typedef function10<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, 
                             Policy, Mixin, Allocator> type;
        };
      };
      template<
        typename R, 
        typename T1, 
        typename T2, 
        typename T3, 
        typename T4,
        typename T5, 
        typename T6, 
        typename T7, 
        typename T8, 
        typename T9,
        typename T10,
        typename Policy = empty_function_policy,
        typename Mixin = empty_function_mixin,
        typename Allocator = std::allocator<function_base> 
      >
      struct get_function_impl
      {
        typedef typename real_get_function_impl<
          (count_used_args<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value)
          >::template params<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, 
                             Policy, Mixin, Allocator>::type
        type;
      };
  template<
    typename R, 
    typename T1, 
    typename T2, 
    typename T3, 
    typename T4,
    typename T5, 
    typename T6, 
    typename T7, 
    typename T8, 
    typename T9,
    typename T10,
    typename MyPolicy = empty_function_policy,
    typename MyMixin = empty_function_mixin,
    typename MyAllocator = std::allocator<function_base> 
  >
  struct function_traits_builder
  {
    typedef typename get_function_impl<R, T1, T2, T3, T4, T5, T6, T7, 
                                       T8, T9, T10, MyPolicy, MyMixin, 
                                       MyAllocator>::type
      type;
    typedef MyPolicy    policy_type;
    typedef MyMixin     mixin_type;
    typedef MyAllocator allocator_type;
 #ifndef BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
    template<typename Policy>
    struct policy : 
        public function_traits_builder<R, T1, T2, T3, T4, T5, T6, T7, T8, T9,
                                       T10, Policy, mixin_type, 
                                       allocator_type> {};
    template<typename Mixin>
    struct mixin : 
        public function_traits_builder<R, T1, T2, T3, T4, T5, T6, T7, T8, T9,
                                       T10, policy_type, Mixin, 
                                       allocator_type> {};
    template<typename Allocator>
    struct allocator : 
        public function_traits_builder<R, T1, T2, T3, T4, T5, T6, T7, T8, T9,
                                       T10, policy_type, mixin_type, 
                                       Allocator> {};
 #else
-    template<typename Policy>
+// What is the '3' for?
-    struct policy 
+#  define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_FUNCTION_MAX_ARGS,<boost/function/detail/function_iterate.hpp>))
-    {
+#  include BOOST_PP_ITERATE()
-      typedef typename function_traits_builder<R, T1, T2, T3, T4, T5, T6, T7,
+#  undef BOOST_PP_ITERATION_PARAMS_1
                                               T8, T9, T10, Policy, 
                                               mixin_type, 
                                               allocator_type>::type
        type;
    };
    template<typename Mixin>
    struct mixin
    {
      typedef typename function_traits_builder<R, T1, T2, T3, T4, T5, T6, T7,
                                               T8, T9, T10, policy_type, Mixin,
                                               allocator_type>::type
        type;
    };
    template<typename Allocator>
    struct allocator
    {
      typedef typename function_traits_builder<R, T1, T2, T3, T4, T5, T6, T7,
                                               T8, T9, T10, policy_type, 
                                               mixin_type, Allocator>::type
        type;
    };
 #endif
  };
    } // end namespace function
  } // end namespace detail
  template<
    typename R, 
    typename T1 = detail::function::unusable, 
    typename T2 = detail::function::unusable,
    typename T3 = detail::function::unusable,
    typename T4 = detail::function::unusable,
    typename T5 = detail::function::unusable,
    typename T6 = detail::function::unusable,
    typename T7 = detail::function::unusable,
    typename T8 = detail::function::unusable,
    typename T9 = detail::function::unusable,
    typename T10 = detail::function::unusable
  >
  class function :
    public detail::function::get_function_impl<R, T1, T2, T3, T4, T5, T6, T7, 
                                               T8, T9, T10>::type,
    public detail::function::function_traits_builder<R, T1, T2, T3, T4, T5, T6,
                                                     T7, T8, T9, T10>
  {
    typedef typename detail::function::get_function_impl<R, T1, T2, T3, T4, T5,
                                                         T6, T7, T8, T9, T10
                                                         >::type 
      base_type;
  public:
    typedef typename base_type::policy_type policy_type;
    typedef typename base_type::mixin_type mixin_type;
    typedef typename base_type::allocator_type allocator_type;              
    typedef function self_type;                                     
    function() : base_type() {}                                     
    template<typename Functor>                                              
    function(Functor BOOST_FUNCTION_TARGET_FIX(const &) f) : base_type(f) {}
    function(const self_type& f) : base_type(static_cast<const base_type&>(f)){}
    template<typename Functor>
    self_type& operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
    {
      self_type(f).swap(*this);
      return *this;
    }
    self_type& operator=(const base_type& f)
    {
      self_type(f).swap(*this);
      return *this;
    }
    self_type& operator=(const self_type& f)
    {   
      self_type(f).swap(*this);
      return *this;
    }
    template<typename Functor>
    void set(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
    {
      self_type(f).swap(*this);
    }
    void set(const base_type& f)
    {
      self_type(f).swap(*this);
    }
    void set(const self_type& f)                             
    {
      self_type(f).swap(*this);
    }   
  };
  template<typename R,
           typename T1, 
           typename T2,
           typename T3,
           typename T4,
           typename T5,
           typename T6,
           typename T7,
           typename T8,
           typename T9,
           typename T10>
  inline void swap(function<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>& f1,
                   function<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>& f2)
  {
    f1.swap(f2);
  }
 }
 #endif
--- a/include/boost/function/detail/function_iterate.hpp
+++ b/include/boost/function/detail/function_iterate.hpp
@ -0,0 +1,22 @@
 // Boost.Function library
 // Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
 // Permission to modify the code and to distribute modified code is granted
 // provided this copyright notice appears in all copies, and a notice
 // that the code was modified is included with the copyright notice.
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
 // For more information, see http://www.boost.org
 #if !defined(BOOST_PP_IS_ITERATING)
 # error Boost.Function - do not include this file!
 #endif
 #define BOOST_FUNCTION_NUM_ARGS BOOST_PP_ITERATION()
 #include <boost/function/detail/maybe_include.hpp>
 #undef BOOST_FUNCTION_NUM_ARGS
--- a/include/boost/function/detail/gen_maybe_include.pl
+++ b/include/boost/function/detail/gen_maybe_include.pl
@ -0,0 +1,37 @@
 #!/usr/bin/perl -w
 #
 # Boost.Function library
 #
 # Copyright (C) 2001-2003 Doug Gregor (gregod@cs.rpi.edu)
 #
 # Permission to copy, use, sell and distribute this software is granted
 # provided this copyright notice appears in all copies.
 # Permission to modify the code and to distribute modified code is granted
 # provided this copyright notice appears in all copies, and a notice
 # that the code was modified is included with the copyright notice.
 #
 # This software is provided "as is" without express or implied warranty,
 # and with no claim as to its suitability for any purpose.
 #
 # For more information, see http://www.boost.org
 use English;
 $max_args = $ARGV[0];
 open (OUT, ">maybe_include.hpp") or die("Cannot write to maybe_include.hpp");
 for($on_arg = 0; $on_arg <= $max_args; ++$on_arg) {
    if ($on_arg == 0) {
 	print OUT "#if";
    }
    else {
 	print OUT "#elif";
    }
    print OUT " BOOST_FUNCTION_NUM_ARGS == $on_arg\n";
    print OUT "#  ifndef BOOST_FUNCTION_$on_arg\n";
    print OUT "#    define BOOST_FUNCTION_$on_arg\n";
    print OUT "#    include <boost/function/function_template.hpp>\n";
    print OUT "#  endif\n";
 }
 print OUT "#else\n";
 print OUT "#  error Cannot handle Boost.Function objects that accept more than $max_args arguments!\n";
 print OUT "#endif\n";
--- a/include/boost/function/detail/maybe_include.hpp
+++ b/include/boost/function/detail/maybe_include.hpp
@ -0,0 +1,273 @@
 // Boost.Function library
 // Copyright (C) 2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
 // Permission to modify the code and to distribute modified code is granted
 // provided this copyright notice appears in all copies, and a notice
 // that the code was modified is included with the copyright notice.
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
 // For more information, see http://www.boost.org
 #if BOOST_FUNCTION_NUM_ARGS == 0
 #  ifndef BOOST_FUNCTION_0
 #    define BOOST_FUNCTION_0
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 1
 #  ifndef BOOST_FUNCTION_1
 #    define BOOST_FUNCTION_1
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 2
 #  ifndef BOOST_FUNCTION_2
 #    define BOOST_FUNCTION_2
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 3
 #  ifndef BOOST_FUNCTION_3
 #    define BOOST_FUNCTION_3
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 4
 #  ifndef BOOST_FUNCTION_4
 #    define BOOST_FUNCTION_4
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 5
 #  ifndef BOOST_FUNCTION_5
 #    define BOOST_FUNCTION_5
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 6
 #  ifndef BOOST_FUNCTION_6
 #    define BOOST_FUNCTION_6
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 7
 #  ifndef BOOST_FUNCTION_7
 #    define BOOST_FUNCTION_7
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 8
 #  ifndef BOOST_FUNCTION_8
 #    define BOOST_FUNCTION_8
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 9
 #  ifndef BOOST_FUNCTION_9
 #    define BOOST_FUNCTION_9
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 10
 #  ifndef BOOST_FUNCTION_10
 #    define BOOST_FUNCTION_10
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 11
 #  ifndef BOOST_FUNCTION_11
 #    define BOOST_FUNCTION_11
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 12
 #  ifndef BOOST_FUNCTION_12
 #    define BOOST_FUNCTION_12
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 13
 #  ifndef BOOST_FUNCTION_13
 #    define BOOST_FUNCTION_13
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 14
 #  ifndef BOOST_FUNCTION_14
 #    define BOOST_FUNCTION_14
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 15
 #  ifndef BOOST_FUNCTION_15
 #    define BOOST_FUNCTION_15
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 16
 #  ifndef BOOST_FUNCTION_16
 #    define BOOST_FUNCTION_16
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 17
 #  ifndef BOOST_FUNCTION_17
 #    define BOOST_FUNCTION_17
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 18
 #  ifndef BOOST_FUNCTION_18
 #    define BOOST_FUNCTION_18
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 19
 #  ifndef BOOST_FUNCTION_19
 #    define BOOST_FUNCTION_19
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 20
 #  ifndef BOOST_FUNCTION_20
 #    define BOOST_FUNCTION_20
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 21
 #  ifndef BOOST_FUNCTION_21
 #    define BOOST_FUNCTION_21
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 22
 #  ifndef BOOST_FUNCTION_22
 #    define BOOST_FUNCTION_22
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 23
 #  ifndef BOOST_FUNCTION_23
 #    define BOOST_FUNCTION_23
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 24
 #  ifndef BOOST_FUNCTION_24
 #    define BOOST_FUNCTION_24
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 25
 #  ifndef BOOST_FUNCTION_25
 #    define BOOST_FUNCTION_25
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 26
 #  ifndef BOOST_FUNCTION_26
 #    define BOOST_FUNCTION_26
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 27
 #  ifndef BOOST_FUNCTION_27
 #    define BOOST_FUNCTION_27
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 28
 #  ifndef BOOST_FUNCTION_28
 #    define BOOST_FUNCTION_28
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 29
 #  ifndef BOOST_FUNCTION_29
 #    define BOOST_FUNCTION_29
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 30
 #  ifndef BOOST_FUNCTION_30
 #    define BOOST_FUNCTION_30
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 31
 #  ifndef BOOST_FUNCTION_31
 #    define BOOST_FUNCTION_31
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 32
 #  ifndef BOOST_FUNCTION_32
 #    define BOOST_FUNCTION_32
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 33
 #  ifndef BOOST_FUNCTION_33
 #    define BOOST_FUNCTION_33
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 34
 #  ifndef BOOST_FUNCTION_34
 #    define BOOST_FUNCTION_34
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 35
 #  ifndef BOOST_FUNCTION_35
 #    define BOOST_FUNCTION_35
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 36
 #  ifndef BOOST_FUNCTION_36
 #    define BOOST_FUNCTION_36
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 37
 #  ifndef BOOST_FUNCTION_37
 #    define BOOST_FUNCTION_37
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 38
 #  ifndef BOOST_FUNCTION_38
 #    define BOOST_FUNCTION_38
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 39
 #  ifndef BOOST_FUNCTION_39
 #    define BOOST_FUNCTION_39
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 40
 #  ifndef BOOST_FUNCTION_40
 #    define BOOST_FUNCTION_40
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 41
 #  ifndef BOOST_FUNCTION_41
 #    define BOOST_FUNCTION_41
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 42
 #  ifndef BOOST_FUNCTION_42
 #    define BOOST_FUNCTION_42
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 43
 #  ifndef BOOST_FUNCTION_43
 #    define BOOST_FUNCTION_43
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 44
 #  ifndef BOOST_FUNCTION_44
 #    define BOOST_FUNCTION_44
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 45
 #  ifndef BOOST_FUNCTION_45
 #    define BOOST_FUNCTION_45
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 46
 #  ifndef BOOST_FUNCTION_46
 #    define BOOST_FUNCTION_46
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 47
 #  ifndef BOOST_FUNCTION_47
 #    define BOOST_FUNCTION_47
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 48
 #  ifndef BOOST_FUNCTION_48
 #    define BOOST_FUNCTION_48
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 49
 #  ifndef BOOST_FUNCTION_49
 #    define BOOST_FUNCTION_49
 #    include <boost/function/function_template.hpp>
 #  endif
 #elif BOOST_FUNCTION_NUM_ARGS == 50
 #  ifndef BOOST_FUNCTION_50
 #    define BOOST_FUNCTION_50
 #    include <boost/function/function_template.hpp>
 #  endif
 #else
 #  error Cannot handle Boost.Function objects that accept more than 50 arguments!
 #endif
--- a/include/boost/function/detail/prologue.hpp
+++ b/include/boost/function/detail/prologue.hpp
@ -0,0 +1,30 @@
 // Boost.Function library
 // Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
 // Permission to modify the code and to distribute modified code is granted
 // provided this copyright notice appears in all copies, and a notice
 // that the code was modified is included with the copyright notice.
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_PROLOGUE_HPP
 #define BOOST_FUNCTION_PROLOGUE_HPP
 #  include <cassert>
 #  include <algorithm>
 #  include <boost/throw_exception.hpp>
 #  include <boost/config.hpp>
 #  include <boost/function/function_base.hpp>
 #  include <boost/mem_fn.hpp>
 #  include <boost/type_traits/is_same.hpp>
 #  include <boost/preprocessor/enum.hpp>
 #  include <boost/preprocessor/enum_params.hpp>
 #  include <boost/preprocessor/cat.hpp>
 #  include <boost/preprocessor/repeat.hpp>
 #  include <boost/preprocessor/inc.hpp>
 #endif // BOOST_FUNCTION_PROLOGUE_HPP
--- a/include/boost/function/function0.hpp
+++ b/include/boost/function/function0.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION0_HEADER
 #define BOOST_FUNCTION_FUNCTION0_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 0
-#define BOOST_FUNCTION_TEMPLATE_PARMS 
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS 
 #define BOOST_FUNCTION_PARMS 
 #define BOOST_FUNCTION_ARGS 
 #define BOOST_FUNCTION_NOT_0_PARMS 
 #define BOOST_FUNCTION_NOT_0_ARGS 
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION0_HEADER
--- a/include/boost/function/function1.hpp
+++ b/include/boost/function/function1.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION1_HEADER
 #define BOOST_FUNCTION_FUNCTION1_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 1
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS T0
 #define BOOST_FUNCTION_PARMS T0 a0
 #define BOOST_FUNCTION_ARGS a0
 #define BOOST_FUNCTION_NOT_0_PARMS 
 #define BOOST_FUNCTION_NOT_0_ARGS 
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION1_HEADER
--- a/include/boost/function/function10.hpp
+++ b/include/boost/function/function10.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION10_HEADER
 #define BOOST_FUNCTION_FUNCTION10_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 10
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4, T5, T6, T7, T8, T9
 #define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8, T9 a9
 #define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4, a5, a6, a7, a8, a9
 #define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8, T9 a9
 #define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4, a5, a6, a7, a8, a9
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION10_HEADER
--- a/include/boost/function/function2.hpp
+++ b/include/boost/function/function2.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION2_HEADER
 #define BOOST_FUNCTION_FUNCTION2_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 2
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1
 #define BOOST_FUNCTION_PARMS T0 a0, T1 a1
 #define BOOST_FUNCTION_ARGS a0, a1
 #define BOOST_FUNCTION_NOT_0_PARMS T1 a1
 #define BOOST_FUNCTION_NOT_0_ARGS a1
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION2_HEADER
--- a/include/boost/function/function3.hpp
+++ b/include/boost/function/function3.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION3_HEADER
 #define BOOST_FUNCTION_FUNCTION3_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 3
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2
 #define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2
 #define BOOST_FUNCTION_ARGS a0, a1, a2
 #define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2
 #define BOOST_FUNCTION_NOT_0_ARGS a1, a2
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION3_HEADER
--- a/include/boost/function/function4.hpp
+++ b/include/boost/function/function4.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION4_HEADER
 #define BOOST_FUNCTION_FUNCTION4_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 4
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3
 #define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3
 #define BOOST_FUNCTION_ARGS a0, a1, a2, a3
 #define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3
 #define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION4_HEADER
--- a/include/boost/function/function5.hpp
+++ b/include/boost/function/function5.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION5_HEADER
 #define BOOST_FUNCTION_FUNCTION5_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 5
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4
 #define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4
 #define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4
 #define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4
 #define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION5_HEADER
--- a/include/boost/function/function6.hpp
+++ b/include/boost/function/function6.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION6_HEADER
 #define BOOST_FUNCTION_FUNCTION6_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 6
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4, T5
 #define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5
 #define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4, a5
 #define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5
 #define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4, a5
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION6_HEADER
--- a/include/boost/function/function7.hpp
+++ b/include/boost/function/function7.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION7_HEADER
 #define BOOST_FUNCTION_FUNCTION7_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 7
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4, T5, T6
 #define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6
 #define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4, a5, a6
 #define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6
 #define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4, a5, a6
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION7_HEADER
--- a/include/boost/function/function8.hpp
+++ b/include/boost/function/function8.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION8_HEADER
 #define BOOST_FUNCTION_FUNCTION8_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 8
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4, T5, T6, T7
 #define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7
 #define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4, a5, a6, a7
 #define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7
 #define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4, a5, a6, a7
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION8_HEADER
--- a/include/boost/function/function9.hpp
+++ b/include/boost/function/function9.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-//
+
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,28 +10,9 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_FUNCTION9_HEADER
 #define BOOST_FUNCTION_FUNCTION9_HEADER
 #define BOOST_FUNCTION_NUM_ARGS 9
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8
+#include <boost/function/detail/maybe_include.hpp>
 #define BOOST_FUNCTION_TEMPLATE_ARGS T0, T1, T2, T3, T4, T5, T6, T7, T8
 #define BOOST_FUNCTION_PARMS T0 a0, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8
 #define BOOST_FUNCTION_ARGS a0, a1, a2, a3, a4, a5, a6, a7, a8
 #define BOOST_FUNCTION_NOT_0_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8
 #define BOOST_FUNCTION_NOT_0_ARGS a1, a2, a3, a4, a5, a6, a7, a8
 #include <boost/function/function_template.hpp>
 #undef BOOST_FUNCTION_NOT_0_ARGS
 #undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_NUM_ARGS
 #endif // BOOST_FUNCTION_FUNCTION9_HEADER
--- a/include/boost/function/function_base.hpp
+++ b/include/boost/function/function_base.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2001-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -10,100 +10,140 @@
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
- 
+
 // For more information, see http://www.boost.org
 #ifndef BOOST_FUNCTION_BASE_HEADER
 #define BOOST_FUNCTION_BASE_HEADER
 #include <string>
 #include <stdexcept>
 #include <string>
 #include <memory>
 #include <new>
 #include <typeinfo>
 #include <boost/config.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/assert.hpp>
 #include <boost/type_traits/arithmetic_traits.hpp>
 #include <boost/type_traits/composite_traits.hpp>
 #include <boost/type_traits/is_stateless.hpp>
 #include <boost/ref.hpp>
 #include <boost/pending/ct_if.hpp>
 #include <boost/detail/workaround.hpp>
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406
+#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406 && !defined(BOOST_STRICT_CONFIG)
 #  define BOOST_FUNCTION_TARGET_FIX(x) x
 #else
 #  define BOOST_FUNCTION_TARGET_FIX(x)
 #endif // not MSVC
 #if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730 && !defined(BOOST_STRICT_CONFIG)
 // Work around a compiler bug.
 // boost::python::objects::function has to be seen by the compiler before the
 // boost::function class template.
 namespace boost { namespace python { namespace objects {
  class function;
 }}}
 #endif
 // GCC 2.95.3 (or earlier) doesn't support enable_if
 #if BOOST_WORKAROUND(__GNUC__, < 3)
 #  define BOOST_FUNCTION_NO_ENABLE_IF
 #endif
 // MIPSpro 7.3.1.3m doesn't support enable_if
 #if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730 && !defined(BOOST_STRICT_CONFIG)
 #  define BOOST_FUNCTION_NO_ENABLE_IF
 #endif
 // MSVC 7.0 doesn't support enable_if
 #if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 && !defined(BOOST_STRICT_CONFIG)
 #  define BOOST_FUNCTION_NO_ENABLE_IF
 #endif
 // Borland C++ 5.6.0 doesn't support enable_if
 #if BOOST_WORKAROUND(__BORLANDC__, <= 0x564)
 #  define BOOST_FUNCTION_NO_ENABLE_IF
 #endif
 // Metrowerks 7.2 doesn't support enable_if
 #if BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
 #  define BOOST_FUNCTION_NO_ENABLE_IF
 #endif
 #if BOOST_WORKAROUND(__SUNPRO_CC, <= 0x540)
 #  define BOOST_FUNCTION_NO_ENABLE_IF
 #endif
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 namespace boost {
 #if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730 && !defined(BOOST_STRICT_CONFIG)
 // The library shipping with MIPSpro 7.3.1.3m has a broken allocator<void>
 class function_base;
 template<typename Signature,
         typename Allocator = std::allocator<function_base> >
 class function;
 #else
 template<typename Signature, typename Allocator = std::allocator<void> >
 class function;
 #endif
 template<typename Signature, typename Allocator>
 inline void swap(function<Signature, Allocator>& f1,
                 function<Signature, Allocator>& f2)
 {
  f1.swap(f2);
 }
 } // end namespace boost
 #endif // have partial specialization
 namespace boost {
  namespace detail {
    namespace function {
      template<bool> struct truth {};
      /*
       * The ct_if implementation is temporary code. When a Boost metaprogramming
       * library is introduced, Boost.Function will use it instead. 
       */
      namespace intimate {
        struct SelectThen 
        {       
          template<typename Then, typename Else>
          struct Result
          {       
            typedef Then type;
          };
        };
        struct SelectElse
        {
          template<typename Then, typename Else>
          struct Result
          { 
            typedef Else type;
          };
        };
        template<bool Condition>
        struct Selector
        {
          typedef SelectThen type;
        };
        template<>
        struct Selector<false>
        {
          typedef SelectElse type;
        };
      } // end namespace intimate 
      template<bool Condition, typename Then, typename Else>
      struct ct_if
      {
        typedef typename intimate::Selector<Condition>::type select;
        typedef typename select::template Result<Then,Else>::type type;
      };
      /**
       * A union of a function pointer and a void pointer. This is necessary
-       * because 5.2.10/6 allows reinterpret_cast<> to safely cast between 
+       * because 5.2.10/6 allows reinterpret_cast<> to safely cast between
       * function pointer types and 5.2.9/10 allows static_cast<> to safely
       * cast between a void pointer and an object pointer. But it is not legal
       * to cast between a function pointer and a void* (in either direction),
       * so function requires a union of the two. */
-      union any_pointer 
+      union any_pointer
      {
        void* obj_ptr;
        const void* const_obj_ptr;
        void (*func_ptr)();
-
+        char data[1];
        explicit any_pointer(void* p) : obj_ptr(p) {}
        explicit any_pointer(const void* p) : const_obj_ptr(p) {}
        explicit any_pointer(void (*p)()) : func_ptr(p) {}
      };
      inline any_pointer make_any_pointer(void* o)
      {
        any_pointer p;
        p.obj_ptr = o;
        return p;
      }
      inline any_pointer make_any_pointer(const void* o)
      {
        any_pointer p;
        p.const_obj_ptr = o;
        return p;
      }
      inline any_pointer make_any_pointer(void (*f)())
      {
        any_pointer p;
        p.func_ptr = f;
        return p;
      }
      /**
       * The unusable class is a placeholder for unused function arguments
       * It is also completely unusable except that it constructable from
       * anything. This helps compilers without partial specialization to
       * handle Boost.Function objects returning void.
       */
-      struct unusable 
+      struct unusable
      {
        unusable() {}
        template<typename T> unusable(const T&) {}
@ -111,19 +151,19 @@ namespace boost {
      /* Determine the return type. This supports compilers that do not support
       * void returns or partial specialization by silently changing the return
-       * type to "unusable". 
+       * type to "unusable".
       */
      template<typename T> struct function_return_type { typedef T type; };
-      template<> 
+      template<>
-      struct function_return_type<void> 
+      struct function_return_type<void>
      {
        typedef unusable type;
      };
      // The operation type to perform on the given functor/function pointer
-      enum functor_manager_operation_type { 
+      enum functor_manager_operation_type {
-        clone_functor_tag, 
+        clone_functor_tag,
        destroy_functor_tag
      };
@ -157,18 +197,18 @@ namespace boost {
      // The trivial manager does nothing but return the same pointer (if we
      // are cloning) or return the null pointer (if we are deleting).
-      inline any_pointer trivial_manager(any_pointer f, 
+      inline any_pointer trivial_manager(any_pointer f,
-					 functor_manager_operation_type op)
+                                         functor_manager_operation_type op)
      {
        if (op == clone_functor_tag)
          return f;
        else
-          return any_pointer(reinterpret_cast<void*>(0));
+          return make_any_pointer(reinterpret_cast<void*>(0));
      }
      /**
       * The functor_manager class contains a static function "manage" which
-       * can clone or destroy the given function/function object pointer. 
+       * can clone or destroy the given function/function object pointer.
       */
      template<typename Functor, typename Allocator>
      struct functor_manager
@ -178,25 +218,25 @@ namespace boost {
        // For function pointers, the manager is trivial
        static inline any_pointer
-        manager(any_pointer function_ptr, 
+        manager(any_pointer function_ptr,
-		functor_manager_operation_type op,
+                functor_manager_operation_type op,
                function_ptr_tag)
        {
          if (op == clone_functor_tag)
            return function_ptr;
          else
-            return any_pointer(static_cast<void (*)()>(0));
+            return make_any_pointer(static_cast<void (*)()>(0));
        }
-        // For function object pointers, we clone the pointer to each 
+        // For function object pointers, we clone the pointer to each
        // function has its own version.
        static inline any_pointer
-        manager(any_pointer function_obj_ptr, 
+        manager(any_pointer function_obj_ptr,
                functor_manager_operation_type op,
                function_obj_tag)
        {
 #ifndef BOOST_NO_STD_ALLOCATOR
-        typedef typename Allocator::template rebind<functor_type>::other 
+        typedef typename Allocator::template rebind<functor_type>::other
          allocator_type;
        typedef typename allocator_type::pointer pointer_type;
 #else
@ -208,7 +248,7 @@ namespace boost {
 #  endif // BOOST_NO_STD_ALLOCATOR
          if (op == clone_functor_tag) {
-            functor_type* f = 
+            functor_type* f =
              static_cast<functor_type*>(function_obj_ptr.obj_ptr);
            // Clone the functor
@ -221,11 +261,11 @@ namespace boost {
 #  else
            functor_type* new_f = new functor_type(*f);
 #  endif // BOOST_NO_STD_ALLOCATOR
-            return any_pointer(static_cast<void*>(new_f));
+            return make_any_pointer(static_cast<void*>(new_f));
          }
          else {
            /* Cast from the void pointer to the functor pointer type */
-            functor_type* f = 
+            functor_type* f =
              reinterpret_cast<functor_type*>(function_obj_ptr.obj_ptr);
 #  ifndef BOOST_NO_STD_ALLOCATOR
@ -240,7 +280,7 @@ namespace boost {
            delete f;
 #  endif // BOOST_NO_STD_ALLOCATOR
-            return any_pointer(static_cast<void*>(0));
+            return make_any_pointer(static_cast<void*>(0));
          }
        }
      public:
@ -254,131 +294,123 @@ namespace boost {
        }
      };
-      // value=1 if the given type is not "unusable"
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
    template<bool cond, typename T> struct enable_if;
    template<typename T> struct enable_if<true, T>  { typedef T type; };
    template<typename T> struct enable_if<false, T> {};
    template<bool x>
    struct enabled
    {
      template<typename T>
-      struct count_if_used
+      struct base
      {
-        BOOST_STATIC_CONSTANT(int, value = 1);
+        typedef T type;
      };
      // value=0 for unusable types
      template<>
      struct count_if_used<unusable>
      {
        BOOST_STATIC_CONSTANT(int, value = 0);
      };
      // Count the number of arguments (from the given set) which are not 
      // "unusable" (therefore, count those arguments that are used).
      template<typename T1, typename T2, typename T3, typename T4, 
               typename T5, typename T6, typename T7, typename T8, 
               typename T9, typename T10>
      struct count_used_args
      {
        BOOST_STATIC_CONSTANT(int, value = 
                              (count_if_used<T1>::value + 
                               count_if_used<T2>::value +
                               count_if_used<T3>::value + 
                               count_if_used<T4>::value +
                               count_if_used<T5>::value + 
                               count_if_used<T6>::value +
                               count_if_used<T7>::value + 
                               count_if_used<T8>::value +
                               count_if_used<T9>::value +
                               count_if_used<T10>::value));
      };
    } // end namespace function
  } // end namespace detail
  /**
   * The function_base class contains the basic elements needed for the
   * function1, function2, function3, etc. classes. It is common to all
   * functions (and as such can be used to tell if we have one of the
   * functionN objects). 
   */
  class function_base 
  {
  public:
    function_base() : manager(0), functor(static_cast<void*>(0)) {}
    // Is this function empty?
    bool empty() const { return !manager; }
  public: // should be protected, but GCC 2.95.3 will fail to allow access
    detail::function::any_pointer (*manager)(
                           detail::function::any_pointer, 
 #if (defined __SUNPRO_CC) && (__SUNPRO_CC <= 0x530) && !(defined BOOST_NO_COMPILER_CONFIG)
    // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
    operator bool () const { return !this->empty(); }
 #else
                           detail::function::functor_manager_operation_type);
    detail::function::any_pointer functor;
  private:
    struct dummy {
      void nonnull() {};
    };
-    typedef void (dummy::*safe_bool)();
+    template<>
    struct enabled<false>
    {
      template<typename T>
      struct base
      {
      };
    };
-  public:
+    template<bool Enabled, typename T>
-    operator safe_bool () const 
+    struct enable_if : public enabled<Enabled>::template base<T>
-      { return (this->empty())? 0 : &dummy::nonnull; }
+    {
    };
 #endif
-    safe_bool operator!() const
+      // A type that is only used for comparisons against zero
-      { return (this->empty())? &dummy::nonnull : 0; }
+      struct useless_clear_type {};
  };
  /* Poison comparison between Boost.Function objects (because it is 
   * meaningless). The comparisons would otherwise be allowed because of the
   * conversion required to allow syntax such as:
   *   boost::function<int, int> f;
   *   if (f) { f(5); }
   */
  void operator==(const function_base&, const function_base&);
  void operator!=(const function_base&, const function_base&);
  namespace detail {
    namespace function {
      // The result is not a Boost.Function object, so we assume that this
      // target is not empty
      template<typename FunctionObj>
      inline bool has_empty_target(const FunctionObj&, truth<false>)
      {
 	return false;
      }
      // The result is a Boost.Function object, so query whether it is empty
      // or not
      template<typename FunctionObj>
      inline bool has_empty_target(const FunctionObj& f, truth<true>)
      { 
        return f.empty();
      }
    } // end namespace function
  } // end namespace detail
-  // The default function policy is to do nothing before and after the call.
+/**
-  struct empty_function_policy
+ * The function_base class contains the basic elements needed for the
 * function1, function2, function3, etc. classes. It is common to all
 * functions (and as such can be used to tell if we have one of the
 * functionN objects).
 */
 class function_base
 {
 public:
  function_base() : manager(0)
  {
-    inline void precall(const function_base*) {}
+    functor.obj_ptr = 0;
-    inline void postcall(const function_base*) {}
+  }
  };
-  // The default function mixin does nothing. The assignment and
+  // Is this function empty?
-  // copy-construction operators are all defined because MSVC defines broken
+  bool empty() const { return !manager; }
  // versions.
  struct empty_function_mixin 
  {
    empty_function_mixin() {}
    empty_function_mixin(const empty_function_mixin&) {}
-    empty_function_mixin& operator=(const empty_function_mixin&) 
+public: // should be protected, but GCC 2.95.3 will fail to allow access
-    {
+  detail::function::any_pointer (*manager)(
-      return *this; 
+    detail::function::any_pointer,
-    }
+    detail::function::functor_manager_operation_type);
-  };
+  detail::function::any_pointer functor;
 };
 /**
 * The bad_function_call exception class is thrown when a boost::function
 * object is invoked
 */
 class bad_function_call : public std::runtime_error
 {
 public:
  bad_function_call() : std::runtime_error("call to empty boost::function") {}
 };
 /* Poison comparison between Boost.Function objects (because it is
 * meaningless). The comparisons would otherwise be allowed because of the
 * conversion required to allow syntax such as:
 *   boost::function<int, int> f;
 *   if (f) { f(5); }
 */
 void operator==(const function_base&, const function_base&);
 void operator!=(const function_base&, const function_base&);
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
 inline bool operator==(const function_base& f,
                       detail::function::useless_clear_type*)
 {
  return f.empty();
 }
 inline bool operator!=(const function_base& f,
                       detail::function::useless_clear_type*)
 {
  return !f.empty();
 }
 inline bool operator==(detail::function::useless_clear_type*,
                       const function_base& f)
 {
  return f.empty();
 }
 inline bool operator!=(detail::function::useless_clear_type*,
                       const function_base& f)
 {
  return !f.empty();
 }
 #endif
 namespace detail {
  namespace function {
    inline bool has_empty_target(const function_base* f)
    {
      return f->empty();
    }
    inline bool has_empty_target(...)
    {
      return false;
    }
  } // end namespace function
 } // end namespace detail
 } // end namespace boost
 #endif // BOOST_FUNCTION_BASE_HEADER
--- a/include/boost/function/function_template.hpp
+++ b/include/boost/function/function_template.hpp
@ -1,6 +1,6 @@
 // Boost.Function library
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2001-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -14,16 +14,23 @@
 // For more information, see http://www.boost.org
 // Note: this header is a header template and must NOT have multiple-inclusion
-// protection. 
+// protection.
 #include <boost/function/detail/prologue.hpp>
-#ifndef BOOST_FUNCTION_FUNCTION_TEMPLATE_HPP
+#define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T)
-#define BOOST_FUNCTION_FUNCTION_TEMPLATE_HPP
+
-#  include <cassert>
+#define BOOST_FUNCTION_TEMPLATE_ARGS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, T)
-#  include <algorithm>
+
-#  include <boost/config.hpp>
+#define BOOST_FUNCTION_PARM(J,I,D) BOOST_PP_CAT(T,I) BOOST_PP_CAT(a,I)
-#  include <boost/function/function_base.hpp>
+
-#  include <boost/mem_fn.hpp>
+#define BOOST_FUNCTION_PARMS BOOST_PP_ENUM(BOOST_FUNCTION_NUM_ARGS,BOOST_FUNCTION_PARM,BOOST_PP_EMPTY)
-#endif // BOOST_FUNCTION_FUNCTION_TEMPLATE_HPP
+
 #define BOOST_FUNCTION_ARGS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, a)
 #define BOOST_FUNCTION_ARG_TYPE(J,I,D) \
  typedef BOOST_PP_CAT(T,I) BOOST_PP_CAT(arg, BOOST_PP_CAT(BOOST_PP_INC(I),_type));
 #define BOOST_FUNCTION_ARG_TYPES BOOST_PP_REPEAT(BOOST_FUNCTION_NUM_ARGS,BOOST_FUNCTION_ARG_TYPE,BOOST_PP_EMPTY)
 // Type of the default allocator
 #ifndef BOOST_NO_STD_ALLOCATOR
@ -34,7 +41,7 @@
 // Comma if nonzero number of arguments
 #if BOOST_FUNCTION_NUM_ARGS == 0
-#  define BOOST_FUNCTION_COMMA 
+#  define BOOST_FUNCTION_COMMA
 #else
 #  define BOOST_FUNCTION_COMMA ,
 #endif // BOOST_FUNCTION_NUM_ARGS > 0
@ -44,7 +51,7 @@
 #define BOOST_FUNCTION_FUNCTION_INVOKER \
  BOOST_JOIN(function_invoker,BOOST_FUNCTION_NUM_ARGS)
 #define BOOST_FUNCTION_VOID_FUNCTION_INVOKER \
-  BOOST_JOIN(void_function_invoker,BOOST_FUNCTION_NUM_ARGS) 
+  BOOST_JOIN(void_function_invoker,BOOST_FUNCTION_NUM_ARGS)
 #define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER \
  BOOST_JOIN(function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
 #define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER \
@ -118,7 +125,7 @@ namespace boost {
      >
      struct BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
      {
-        static unusable invoke(any_pointer function_obj_ptr 
+        static unusable invoke(any_pointer function_obj_ptr
                               BOOST_FUNCTION_COMMA
                               BOOST_FUNCTION_PARMS)
@ -150,7 +157,7 @@ namespace boost {
      >
      struct BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER
      {
-        static unusable invoke(any_pointer BOOST_FUNCTION_COMMA 
+        static unusable invoke(any_pointer BOOST_FUNCTION_COMMA
                               BOOST_FUNCTION_PARMS)
        {
@ -229,18 +236,25 @@ namespace boost {
  template<
    typename R BOOST_FUNCTION_COMMA
    BOOST_FUNCTION_TEMPLATE_PARMS,
    typename Policy    = empty_function_policy,
    typename Mixin     = empty_function_mixin,
    typename Allocator = BOOST_FUNCTION_DEFAULT_ALLOCATOR
  >
-  class BOOST_FUNCTION_FUNCTION : public function_base, public Mixin
+  class BOOST_FUNCTION_FUNCTION : public function_base
  {
-    typedef typename detail::function::function_return_type<R>::type 
+    typedef typename detail::function::function_return_type<R>::type
      internal_result_type;
    struct clear_type {};
  public:
    BOOST_STATIC_CONSTANT(int, args = BOOST_FUNCTION_NUM_ARGS);
-    
+
    // add signature for boost::lambda
    template<typename Args>
    struct sig
    {
      typedef internal_result_type type;
    };
 #if BOOST_FUNCTION_NUM_ARGS == 1
    typedef T0 argument_type;
 #elif BOOST_FUNCTION_NUM_ARGS == 2
@ -248,41 +262,49 @@ namespace boost {
    typedef T1 second_argument_type;
 #endif
    BOOST_STATIC_CONSTANT(int, arity = BOOST_FUNCTION_NUM_ARGS);
    BOOST_FUNCTION_ARG_TYPES
 #ifndef BOOST_NO_VOID_RETURNS
    typedef R         result_type;
 #else
    typedef internal_result_type result_type;
 #endif // BOOST_NO_VOID_RETURNS
    typedef Policy    policy_type;
    typedef Mixin     mixin_type;
    typedef Allocator allocator_type;
    typedef BOOST_FUNCTION_FUNCTION self_type;
-    BOOST_FUNCTION_FUNCTION() : function_base(), Mixin(), invoker(0) {}
+    BOOST_FUNCTION_FUNCTION() : function_base()
-
+                              , invoker(0) {}
    explicit BOOST_FUNCTION_FUNCTION(const Mixin& m) : 
      function_base(), Mixin(m), invoker(0) 
    {
    }
    // MSVC chokes if the following two constructors are collapsed into
    // one with a default parameter.
    template<typename Functor>
-    BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f) :
+    BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f
-      function_base(), Mixin(), invoker(0)
+#ifndef BOOST_FUNCTION_NO_ENABLE_IF
                            ,typename detail::function::enable_if<
                            (::boost::type_traits::ice_not<
                             (is_same<Functor, int>::value)>::value),
                                        int>::type = 0
 #endif // BOOST_FUNCTION_NO_ENABLE_IF
                            ) :
      function_base(),
      invoker(0)
    {
      this->assign_to(f);
    }
-    template<typename Functor>
+#ifndef BOOST_FUNCTION_NO_ENABLE_IF
-    BOOST_FUNCTION_FUNCTION(Functor f, const Mixin& m) :
+    BOOST_FUNCTION_FUNCTION(clear_type*) : function_base(), invoker(0) {}
-      function_base(), Mixin(m), invoker(0)
+#else
    BOOST_FUNCTION_FUNCTION(int zero) : function_base(), invoker(0)
    {
-      this->assign_to(f);
+      BOOST_ASSERT(zero == 0);
    }
 #endif
    BOOST_FUNCTION_FUNCTION(const BOOST_FUNCTION_FUNCTION& f) :
-      function_base(), Mixin(static_cast<const Mixin&>(f)), invoker(0)
+      function_base(),
      invoker(0)
    {
      this->assign_to_own(f);
    }
@ -291,16 +313,13 @@ namespace boost {
    result_type operator()(BOOST_FUNCTION_PARMS) const
    {
-      assert(!this->empty());
+      if (this->empty())
        boost::throw_exception(bad_function_call());
-      policy_type policy;
+      internal_result_type result = invoker(function_base::functor
      policy.precall(this);
      internal_result_type result = invoker(function_base::functor 
                                            BOOST_FUNCTION_COMMA
                                            BOOST_FUNCTION_ARGS);
      policy.postcall(this);
 #ifndef BOOST_NO_VOID_RETURNS
      return static_cast<result_type>(result);
 #else
@ -311,21 +330,37 @@ namespace boost {
    // The distinction between when to use BOOST_FUNCTION_FUNCTION and
    // when to use self_type is obnoxious. MSVC cannot handle self_type as
    // the return type of these assignment operators, but Borland C++ cannot
-    // handle BOOST_FUNCTION_FUNCTION as the type of the temporary to 
+    // handle BOOST_FUNCTION_FUNCTION as the type of the temporary to
    // construct.
    template<typename Functor>
-    BOOST_FUNCTION_FUNCTION& 
+#ifndef BOOST_FUNCTION_NO_ENABLE_IF
    typename detail::function::enable_if<
               (::boost::type_traits::ice_not<
                 (is_same<Functor, int>::value)>::value),
               BOOST_FUNCTION_FUNCTION&>::type
 #else
    BOOST_FUNCTION_FUNCTION&
 #endif
    operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
    {
-      self_type(f, static_cast<const Mixin&>(*this)).swap(*this);
+      self_type(f).swap(*this);
      return *this;
    }
-    template<typename Functor>
+#ifndef BOOST_FUNCTION_NO_ENABLE_IF
-    void set(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
+    BOOST_FUNCTION_FUNCTION& operator=(clear_type*)
    {
-      self_type(f, static_cast<const Mixin&>(*this)).swap(*this);
+      this->clear();
      return *this;
    }
 #else
    BOOST_FUNCTION_FUNCTION& operator=(int zero)
    {
      BOOST_ASSERT(zero == 0);
      this->clear();
      return *this;
    }
 #endif
    // Assignment from another BOOST_FUNCTION_FUNCTION
    BOOST_FUNCTION_FUNCTION& operator=(const BOOST_FUNCTION_FUNCTION& f)
@ -337,15 +372,6 @@ namespace boost {
      return *this;
    }
    // Assignment from another BOOST_FUNCTION_FUNCTION
    void set(const BOOST_FUNCTION_FUNCTION& f)
    {
      if (&f == this)
        return;
      self_type(f).swap(*this);
    }
    void swap(BOOST_FUNCTION_FUNCTION& other)
    {
      if (&other == this)
@ -354,31 +380,49 @@ namespace boost {
      std::swap(function_base::manager, other.manager);
      std::swap(function_base::functor, other.functor);
      std::swap(invoker, other.invoker);
      std::swap(static_cast<Mixin&>(*this), static_cast<Mixin&>(other));
    }
    // Clear out a target, if there is one
    void clear()
    {
      if (function_base::manager) {
-        function_base::functor = 
+        function_base::functor =
-	  function_base::manager(function_base::functor, 
+          function_base::manager(function_base::functor,
-				 detail::function::destroy_functor_tag);
+                                 detail::function::destroy_functor_tag);
      }
      function_base::manager = 0;
      invoker = 0;
    }
 #if (defined __SUNPRO_CC) && (__SUNPRO_CC <= 0x530) && !(defined BOOST_NO_COMPILER_CONFIG)
    // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
    operator bool () const { return !this->empty(); }
 #else
  private:
    struct dummy {
      void nonnull() {};
    };
    typedef void (dummy::*safe_bool)();
  public:
    operator safe_bool () const
      { return (this->empty())? 0 : &dummy::nonnull; }
    bool operator!() const
      { return this->empty(); }
 #endif
  private:
    void assign_to_own(const BOOST_FUNCTION_FUNCTION& f)
    {
      if (!f.empty()) {
        invoker = f.invoker;
        function_base::manager = f.manager;
-        function_base::functor = 
+        function_base::functor =
-	  f.manager(f.functor, detail::function::clone_functor_tag);
+          f.manager(f.functor, detail::function::clone_functor_tag);
-      }          
+      }
    }
    template<typename Functor>
@ -392,7 +436,7 @@ namespace boost {
    void assign_to(FunctionPtr f, detail::function::function_ptr_tag)
    {
      clear();
-        
+
      if (f) {
        typedef typename detail::function::BOOST_FUNCTION_GET_FUNCTION_INVOKER<
                           FunctionPtr,
@ -400,19 +444,19 @@ namespace boost {
                           BOOST_FUNCTION_TEMPLATE_ARGS
                         >::type
          invoker_type;
-    
+
        invoker = &invoker_type::invoke;
-        function_base::manager = 
+        function_base::manager =
-	  &detail::function::functor_manager<FunctionPtr, Allocator>::manage;
+          &detail::function::functor_manager<FunctionPtr, Allocator>::manage;
-        function_base::functor = 
+        function_base::functor =
-	  function_base::manager(detail::function::any_pointer(
+          function_base::manager(detail::function::make_any_pointer(
                            // should be a reinterpret cast, but some compilers
                            // insist on giving cv-qualifiers to free functions
                            (void (*)())(f)
                          ),
                          detail::function::clone_functor_tag);
      }
-    }  
+    }
 #if BOOST_FUNCTION_NUM_ARGS > 0
    template<typename MemberPtr>
@ -421,75 +465,67 @@ namespace boost {
      this->assign_to(mem_fn(f));
    }
 #endif // BOOST_FUNCTION_NUM_ARGS > 0
-        
+
    template<typename FunctionObj>
    void assign_to(FunctionObj f, detail::function::function_obj_tag)
    {
-      typedef detail::function::truth<
+      if (!detail::function::has_empty_target(addressof(f))) {
-                boost::is_base_and_derived<function_base, FunctionObj>::value>
+        typedef
 	is_boost_function;
      if (!detail::function::has_empty_target(f, is_boost_function())) {
        typedef 
          typename detail::function::BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
                                       FunctionObj,
                                       R BOOST_FUNCTION_COMMA
                                       BOOST_FUNCTION_TEMPLATE_ARGS
                                     >::type
          invoker_type;
-    
+
        invoker = &invoker_type::invoke;
        function_base::manager = &detail::function::functor_manager<
-	                            FunctionObj, Allocator>::manage;
+                                    FunctionObj, Allocator>::manage;
 #ifndef BOOST_NO_STD_ALLOCATOR
-        typedef typename Allocator::template rebind<FunctionObj>::other 
+        typedef typename Allocator::template rebind<FunctionObj>::other
          allocator_type;
        typedef typename allocator_type::pointer pointer_type;
-	allocator_type allocator;
+        allocator_type allocator;
-	pointer_type copy = allocator.allocate(1);
+        pointer_type copy = allocator.allocate(1);
-	allocator.construct(copy, f);
+        allocator.construct(copy, f);
-	// Get back to the original pointer type
+        // Get back to the original pointer type
-	FunctionObj* new_f = static_cast<FunctionObj*>(copy);
+        FunctionObj* new_f = static_cast<FunctionObj*>(copy);
 #else
-	FunctionObj* new_f = new FunctionObj(f);
+        FunctionObj* new_f = new FunctionObj(f);
 #endif // BOOST_NO_STD_ALLOCATOR
-        function_base::functor = 
+        function_base::functor =
-	  detail::function::any_pointer(static_cast<void*>(new_f));
+          detail::function::make_any_pointer(static_cast<void*>(new_f));
      }
    }
-    
+
    template<typename FunctionObj>
-    void assign_to(const reference_wrapper<FunctionObj>& f, 
+    void assign_to(const reference_wrapper<FunctionObj>& f,
                   detail::function::function_obj_ref_tag)
    {
-      typedef detail::function::truth<
+      if (!detail::function::has_empty_target(f.get_pointer())) {
-                boost::is_base_and_derived<function_base, FunctionObj>::value>
+        typedef
 	is_boost_function;
      if (!detail::function::has_empty_target(f.get(), is_boost_function())) {
        typedef 
          typename detail::function::BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
                                       FunctionObj,
                                       R BOOST_FUNCTION_COMMA
                                       BOOST_FUNCTION_TEMPLATE_ARGS
                                     >::type
          invoker_type;
-    
+
        invoker = &invoker_type::invoke;
        function_base::manager = &detail::function::trivial_manager;
-        function_base::functor = 
+        function_base::functor =
          function_base::manager(
-            detail::function::any_pointer(
+            detail::function::make_any_pointer(
              const_cast<FunctionObj*>(f.get_pointer())),
-	    detail::function::clone_functor_tag);
+            detail::function::clone_functor_tag);
      }
    }
-    
+
    template<typename FunctionObj>
    void assign_to(FunctionObj, detail::function::stateless_function_obj_tag)
    {
-      typedef 
+      typedef
          typename detail::function::
                     BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER<
                       FunctionObj,
@ -499,36 +535,121 @@ namespace boost {
          invoker_type;
      invoker = &invoker_type::invoke;
      function_base::manager = &detail::function::trivial_manager;
-      function_base::functor = detail::function::any_pointer(this);
+      function_base::functor = detail::function::make_any_pointer(this);
    }
    typedef internal_result_type (*invoker_type)(detail::function::any_pointer
                                                 BOOST_FUNCTION_COMMA
                                                 BOOST_FUNCTION_TEMPLATE_ARGS);
-    
+
    invoker_type invoker;
  };
  template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
-           typename Policy, typename Mixin, typename Allocator>
+           typename Allocator>
  inline void swap(BOOST_FUNCTION_FUNCTION<
                     R BOOST_FUNCTION_COMMA
                     BOOST_FUNCTION_TEMPLATE_ARGS ,
                     Policy,
                     Mixin,
                     Allocator
                   >& f1,
                   BOOST_FUNCTION_FUNCTION<
-                     R BOOST_FUNCTION_COMMA 
+                     R BOOST_FUNCTION_COMMA
                     BOOST_FUNCTION_TEMPLATE_ARGS,
                     Policy,
                     Mixin,
                     Allocator
                   >& f2)
  {
    f1.swap(f2);
  }
-}
+
 #if !defined (BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)                         \
 && !defined(BOOST_BCB_PARTIAL_SPECIALIZATION_BUG)                              \
 && (BOOST_STRICT_CONFIG || !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x540)
 #if BOOST_FUNCTION_NUM_ARGS == 0
 #define BOOST_FUNCTION_PARTIAL_SPEC R (void)
 #else
 #define BOOST_FUNCTION_PARTIAL_SPEC R (BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS,T))
 #endif
 template<typename R BOOST_FUNCTION_COMMA
         BOOST_FUNCTION_TEMPLATE_PARMS,
         typename Allocator>
 class function<BOOST_FUNCTION_PARTIAL_SPEC, Allocator>
  : public BOOST_FUNCTION_FUNCTION<R, BOOST_FUNCTION_TEMPLATE_ARGS
                                   BOOST_FUNCTION_COMMA Allocator>
 {
  typedef BOOST_FUNCTION_FUNCTION<R, BOOST_FUNCTION_TEMPLATE_ARGS
                                  BOOST_FUNCTION_COMMA Allocator> base_type;
  typedef function self_type;
  struct clear_type {};
 public:
  typedef typename base_type::allocator_type allocator_type;
  function() : base_type() {}
  template<typename Functor>
  function(Functor f
 #ifndef BOOST_FUNCTION_NO_ENABLE_IF
           ,typename detail::function::enable_if<
                            (::boost::type_traits::ice_not<
                          (is_same<Functor, int>::value)>::value),
                       int>::type = 0
 #endif
           ) :
    base_type(f)
  {
  }
 #ifndef BOOST_FUNCTION_NO_ENABLE_IF
  function(clear_type*) : base_type() {}
 #endif
  function(const self_type& f) : base_type(static_cast<const base_type&>(f)){}
  function(const base_type& f) : base_type(static_cast<const base_type&>(f)){}
  self_type& operator=(const self_type& f)
  {
    self_type(f).swap(*this);
    return *this;
  }
  template<typename Functor>
 #ifndef BOOST_FUNCTION_NO_ENABLE_IF
  typename detail::function::enable_if<
                            (::boost::type_traits::ice_not<
                         (is_same<Functor, int>::value)>::value),
                      self_type&>::type
 #else
  self_type&
 #endif
  operator=(Functor f)
  {
    self_type(f).swap(*this);
    return *this;
  }
 #ifndef BOOST_FUNCTION_NO_ENABLE_IF
  self_type& operator=(clear_type*)
  {
    this->clear();
    return *this;
  }
 #endif
  self_type& operator=(const base_type& f)
  {
    self_type(f).swap(*this);
    return *this;
  }
 };
 #undef BOOST_FUNCTION_PARTIAL_SPEC
 #endif // have partial specialization
 } // end namespace boost
 // Cleanup after ourselves...
 #undef BOOST_FUNCTION_DEFAULT_ALLOCATOR
@ -544,3 +665,10 @@ namespace boost {
 #undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
 #undef BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER
 #undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_PARMS
 #undef BOOST_FUNCTION_PARM
 #undef BOOST_FUNCTION_ARGS
 #undef BOOST_FUNCTION_ARG_TYPE
 #undef BOOST_FUNCTION_ARG_TYPES
--- a/include/boost/function/gen_function_N.pl
+++ b/include/boost/function/gen_function_N.pl
@ -2,7 +2,7 @@
 #
 # Boost.Function library
 #
-# Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+# Copyright (C) 2001-2003 Doug Gregor (gregod@cs.rpi.edu)
 #
 # Permission to copy, use, sell and distribute this software is granted
 # provided this copyright notice appears in all copies.
@ -25,87 +25,8 @@ if ($#ARGV < 0) {
 $totalNumArgs = $ARGV[0];
 for ($numArgs = 0; $numArgs <= $totalNumArgs; ++$numArgs) {
  open OUT, ">function$numArgs.hpp";
  print OUT "// Boost.Function library\n";
  print OUT "//\n";
  print OUT "// Copyright (C) 2001 Doug Gregor (gregod\@cs.rpi.edu)\n";
  print OUT "//\n";
  print OUT "// Permission to copy, use, sell and distribute this software is granted\n";
  print OUT "// provided this copyright notice appears in all copies.\n";
  print OUT "// Permission to modify the code and to distribute modified code is granted\n";
  print OUT "// provided this copyright notice appears in all copies, and a notice\n";
  print OUT "// that the code was modified is included with the copyright notice.\n";
  print OUT "//\n";
  print OUT "// This software is provided \"as is\" without express or implied warranty,\n";
  print OUT "// and with no claim as to its suitability for any purpose.\n";
  print OUT " \n";
  print OUT "// For more information, see http://www.boost.org\n";
  print OUT "\n";
  print OUT "#ifndef BOOST_FUNCTION_FUNCTION" . $numArgs . "_HEADER\n";
  print OUT "#define BOOST_FUNCTION_FUNCTION" , $numArgs . "_HEADER\n";
  print OUT "\n";
  print OUT "#define BOOST_FUNCTION_NUM_ARGS $numArgs\n";
-
+  print OUT "#include <boost/function/detail/maybe_include.hpp>\n";
  $templateParms = "";
  for ($i = 0; $i < $numArgs; ++$i) {
    if ($i > 0) {
      $templateParms .= ", ";
    }
    $templateParms .= "typename T$i";
  }
  print OUT "#define BOOST_FUNCTION_TEMPLATE_PARMS $templateParms\n";
  $_ = $templateParms;
  s/typename //g;
  $templateArgs = $_;
  print OUT "#define BOOST_FUNCTION_TEMPLATE_ARGS $templateArgs\n";
  $parms = "";
  for ($i = 0; $i < $numArgs; ++$i) {
    if ($i > 0) {
      $parms .= ", ";
    }
    $parms .= "T$i a$i";
  }
  print OUT "#define BOOST_FUNCTION_PARMS $parms\n";
  $args = "";
  for ($i = 0; $i < $numArgs; ++$i) {
    if ($i > 0) {
      $args .= ", ";
    }
    $args .= "a$i";
  }
  print OUT "#define BOOST_FUNCTION_ARGS $args\n";
  $not0Parms = "";
  for ($i = 1; $i < $numArgs; ++$i) {
    if ($i > 1) {
      $not0Parms .= ", ";
    }
    $not0Parms .= "T$i a$i";
  }
  print OUT "#define BOOST_FUNCTION_NOT_0_PARMS $not0Parms\n";
  $not0Args = "";
  for ($i = 1; $i < $numArgs; ++$i) {
    if ($i > 1) {
      $not0Args .= ", ";
    }
    $not0Args .= "a$i";
  }
  print OUT "#define BOOST_FUNCTION_NOT_0_ARGS $not0Args\n";
  print OUT "\n";
  print OUT "#include <boost/function/function_template.hpp>\n";
  print OUT "\n";
  print OUT "#undef BOOST_FUNCTION_NOT_0_ARGS\n";
  print OUT "#undef BOOST_FUNCTION_NOT_0_PARMS\n";
  print OUT "#undef BOOST_FUNCTION_ARGS\n";
  print OUT "#undef BOOST_FUNCTION_PARMS\n";
  print OUT "#undef BOOST_FUNCTION_TEMPLATE_ARGS\n";
  print OUT "#undef BOOST_FUNCTION_TEMPLATE_PARMS\n";
  print OUT "#undef BOOST_FUNCTION_NUM_ARGS\n";
  print OUT "\n";
  print OUT "#endif // BOOST_FUNCTION_FUNCTION" . $numArgs . "_HEADER\n";
  close OUT;
 }
--- a/index.html
+++ b/index.html
@ -1,89 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-  <head>
+<head>
-    <title>Boost.Function</title>
+<meta http-equiv="refresh" content="0; URL=../../doc/html/function.html">
-  </head>
+</head>
-
+<body>
-  <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080">
+Automatic redirection failed, please go to
-
+<a href="../../doc/html/function.html">../../doc/html/function.html</a>
-  <h1><IMG SRC="../../c++boost.gif" WIDTH="276" HEIGHT="86">Header &lt;<a HREF="../../boost/function.hpp">boost/function.hpp</a>&gt;</h1>
+</body>
 <p> The header &lt;<a HREF="../../boost/function.hpp">boost/function.hpp</a>&gt; includes a family of class templates that are function object wrappers. The notion is similar to a generalized callback. It shares features with function pointers in that both define a call interface (e.g., a function taking two integer arguments and returning a floating-point value) through which some implementation can be called, and the implementation that is invoked may change throughout the course of the program.
 <p> Generally, any place in which a function pointer would be used to defer a call or make a callback, Boost.Function can be used instead to allow the user greater flexibility in the implementation of the target. Targets can be any 'compatible' function object (or function pointer), meaning that the arguments to the interface designated by Boost.Function can be converted to the arguments of the target function object.
 <ul>
  <li><a href="doc/tutorial.html">Tutorial</a></li>
  <li><a href="doc/reference.html">Reference manual</a></li>
  <li><a href="#vspointers">Boost.Function vs. Function Pointers</a></li>
  <li><a href="#performance">Performance</a></li>
  <li><a href="#portability">Portability</a></li>
  <li><a href="#design">Design rationale</a></li>
  <li><a href="#acknowledgements">Acknowledgements</a></li>
  <li><a href="doc/faq.html">Frequently Asked Questions</a></li>
 </ul>
 <h2><a name="vspointers">Boost.Function vs. Function Pointers</a></h2>
 <p>Boost.Function has several advantages over function pointers, namely:
 <ul>
   <li>Boost.Function allows arbitrary compatible function objects to be targets (instead of requiring an exact function signature).</li>
   <li>Boost.Function may be used with argument-binding and other function object construction libraries.</li>
   <li>Boost.Function has predictible debug behavior when an empty function object is called. </li>
   <li>Boost.Function can be adapted to perform operations before and after each call, allowing, for instance, synchronization primitives to be made part of the function type.</li>
 </ul>
 And, of course, function pointers have several advantages over Boost.Function:
 <ul>
    <li> Function pointers are smaller (the size of one pointer instead of three) </li>
    <li> Function pointers are faster (Boost.Function may require two calls through function pointers) </li>
    <li> Function pointers are backward-compatible with C libraries.</li>
    <li> More readable error messages. </li>
 </ul>
 <p> The above two lists were adapted from comments made by Darin Adler.
 <h2><a name="performance">Performance</a></h2>
 <h3>Function object wrapper size</h3>
 <p> Function object wrappers will be the size of two function pointers plus one function pointer or data pointer (whichever is larger). On common 32-bit platforms, this amounts to 12 bytes per wrapper. Additionally, the function object target will be allocated on the heap.
 <h3>Copying efficiency</h3>
 <p> Copying function object wrappers may require allocating memory for a copy of the function object target. The default allocator may be replaced with a faster custom allocator or one may choose to allow the function object wrappers to only store function object targets by reference (using <a href="../bind/ref.html"><code>ref</code></a>) if the cost of this cloning becomes prohibitive.
 <h3>Invocation efficiency</h3>
 <p> With a properly inlining compiler, an invocation of a function object requires one call through a function pointer. If the call is to a free function pointer, an additional call must be made to that function pointer (unless the compiler has very powerful interprocedural analysis).
 <h2><a name="portability">Portability</a></h2>
 <p> The function object wrappers have been designed to be as portable as possible, and to support many compilers even when they do not support the C++ standard well. The following compilers have passed all of the test cases included with <code>boost::function</code>.
 <ul>
  <li>GCC 2.95.3</li>
  <li>GCC 3.0</li>
  <li>SGI MIPSpro 7.3.0</li>
  <li>Borland C++ 5.5.1</li>
  <li>Comeau C++ 4.2.45.2</li>
  <li>Metrowerks Codewarrior 6.1</li>
 </ul>
 <p> The following compilers work with <code>boost::function</code>, but have some problems:
 <ul>
  <li>Microsoft Visual C++ 6.0 (service pack 5): allocators not supported, some problems with <code>boost::function</code> class template (numbered variants seem to work)</li>
  <li>Intel C++ 5.0: allocators not supported</li>
 </ul>
 <p> If your compiler is not listed, there is a small set of tests to stress the capabilities of the <code>boost::function</code> library. A standards-compliant compiler should compile the code without any modifications, but if you find you run into problems please submit a bug report.
 <h2><a name="design">Design rationale</a></h2>
 <h3>Combatting virtual function bloat</h3>
 <p> The use of virtual functions tends to cause 'code bloat' on many compilers. When a class contains a virtual function, it is necessary to emit an additional function that classifies the type of the object. It has been our experience that these auxiliary functions increase the size of the executable significantly when many <code>boost::function</code> objects are used. 
 <p> In Boost.Function, an alternative but equivalent approach was taken using free functions instead of virtual functions. The Boost.Function object essentially holds two pointers to make a valid target call: a void pointer to the function object it contains and a void pointer to an "invoker" that can call the function object, given the function pointer. This invoker function performs the argument and return value conversions Boost.Function provides. A third pointer points to a free function called the "manager", which handles the cloning and destruction of function objects. The scheme is typesafe because the only functions that actually handle the function object, the invoker and the manager, are instantiated given the type of the function object, so they can safely cast the incoming void pointer (the function object pointer) to the appropriate type.
 <h2><a name="acknowledgements">Acknowledgements</a></h2>
 <p> Many people were involved in the construction of this library. William Kempf, Jesse Jones and Karl Nelson were all extremely helpful in isolating an interface and scope for the library. John Maddock managed the formal review, and many reviewers gave excellent comments on interface, implementation, and documentation. 
    <hr>
    <address><a href="mailto:gregod@cs.rpi.edu">Doug Gregor</a></address>
  </body>
 </html>
--- a/test/Jamfile
+++ b/test/Jamfile
@ -0,0 +1,69 @@
 # Function library
 # Copyright (C) 2001-2003 Douglas Gregor
 # Permission to copy, use, sell and distribute this software is granted 
 # provided this copyright notice appears in all copies. Permission to modify 
 # the code and to distribute modified code is granted provided this copyright 
 # notice appears in all copies, and a notice that the code was modified is 
 # included with the copyright notice. This software is provided "as is" 
 # without express or implied warranty, and with no claim as to its suitability 
 # for any purpose. 
 # For more information, see http://www.boost.org/
 # Testing Jamfile autogenerated from XML source
 subproject libs/function/test ;
 # bring in rules for testing
 SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
 include testing.jam ;
 # Make tests run by default.
 DEPENDS all : test ;
 {
  # look in BOOST_ROOT for sources first, just in this Jamfile
  local SEARCH_SOURCE = $(BOOST_ROOT) $(SEARCH_SOURCE) ;
  test-suite function
    : 
  [ run libs/function/test/function_test.cpp :  :  :  : lib_function_test ]
  [ run libs/function/test/function_n_test.cpp :  :  :  :  ]
  [ run libs/function/test/allocator_test.cpp <lib>../../../libs/test/build/boost_test_exec_monitor :  :  :  :  ]
  [ run libs/function/test/stateless_test.cpp <lib>../../../libs/test/build/boost_test_exec_monitor :  :  :  :  ]
  [ run libs/function/test/lambda_test.cpp <lib>../../../libs/test/build/boost_test_exec_monitor :  :  :  :  ]
  [ compile-fail libs/function/test/function_test_fail1.cpp :  :  :  :  ]
  [ compile-fail libs/function/test/function_test_fail2.cpp :  :  :  :  ]
  [ compile libs/function/test/function_30.cpp :  :  :  :  ] 
  [ run libs/function/test/function_arith_cxx98.cpp :  :  :  :  ]
  [ run libs/function/test/function_arith_portable.cpp :  :  :  :  ]
  [ run libs/function/test/sum_avg_cxx98.cpp :  :  :  :  ]
  [ run libs/function/test/sum_avg_portable.cpp :  :  :  :  ]
  [ run libs/function/test/mem_fun_cxx98.cpp :  :  :  :  ]
  [ run libs/function/test/mem_fun_portable.cpp :  :  :  :  ]
  [ run libs/function/test/std_bind_cxx98.cpp :  :  :  :  ]
  [ run libs/function/test/std_bind_portable.cpp :  :  :  :  ]
  [ run libs/function/test/function_ref_cxx98.cpp :  :  :  :  ]
  [ run libs/function/test/function_ref_portable.cpp :  :  :  :  ]
 ;
 }
--- a/test/allocator_test.cpp
+++ b/test/allocator_test.cpp
@ -60,7 +60,7 @@ static void do_nothing() {}
 int
 test_main(int, char*[])
 {
-  function<int, int, int>::allocator< counting_allocator<int> >::type f; 
+  function2<int, int, int, counting_allocator<int> > f; 
  f = plus<int>();
  f.clear();
  BOOST_TEST(alloc_count == 1);
@ -71,7 +71,7 @@ test_main(int, char*[])
  f = &do_minus;
  f.clear();
-  function<void>::allocator< counting_allocator<int> >::type fv;
+  function0<void, counting_allocator<int> > fv;
  alloc_count = 0;
  dealloc_count = 0;
  fv = DoNothing();
--- a/test/function_30.cpp
+++ b/test/function_30.cpp
@ -0,0 +1,31 @@
 // Boost.Function library
 // Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
 // Permission to modify the code and to distribute modified code is granted
 // provided this copyright notice appears in all copies, and a notice
 // that the code was modified is included with the copyright notice.
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
 // For more information, see http://www.boost.org
 // Make sure we don't try to redefine function2
 #include <boost/function/function2.hpp>
 // Define all Boost.Function class templates up to 30 arguments
 #define BOOST_FUNCTION_MAX_ARGS 30
 #include <boost/function.hpp>
 int main()
 {
  boost::function0<float> f0;
  boost::function30<float, int, int, int, int, int, int, int, int, int, int,
                    int, int, int, int, int, int, int, int, int, int,
                    int, int, int, int, int, int, int, int, int, int> f30;
  return 0;
 }
--- a/test/function_arith_cxx98.cpp
+++ b/test/function_arith_cxx98.cpp
@ -0,0 +1,38 @@
 // Function library
 // Copyright (C) 2001-2003 Douglas Gregor
 // Permission to copy, use, sell and distribute this software is granted 
 // provided this copyright notice appears in all copies. Permission to modify 
 // the code and to distribute modified code is granted provided this copyright 
 // notice appears in all copies, and a notice that the code was modified is 
 // included with the copyright notice. This software is provided "as is" 
 // without express or implied warranty, and with no claim as to its 
 // suitability for any purpose. 
 // For more information, see http://www.boost.org/
 #include <boost/function.hpp>
 #include <iostream>
 float mul_ints(int x, int y) { return ((float)x) * y; }
 struct int_div { 
  float operator()(int x, int y) const { return ((float)x)/y; }; 
 };
 int main()
 {
    boost::function<float (int x, int y)> f;
    f = int_div();
    std::cout << f(5, 3) << std::endl;
    if (f)
  std::cout << f(5, 3) << std::endl;
 else
  std::cout << "f has no target, so it is unsafe to call" << std::endl;
    f = 0;
    f = &mul_ints;
    return 0;
 }
--- a/test/function_arith_portable.cpp
+++ b/test/function_arith_portable.cpp
@ -0,0 +1,36 @@
 // Function library
 // Copyright (C) 2001-2003 Douglas Gregor
 // Permission to copy, use, sell and distribute this software is granted 
 // provided this copyright notice appears in all copies. Permission to modify 
 // the code and to distribute modified code is granted provided this copyright 
 // notice appears in all copies, and a notice that the code was modified is 
 // included with the copyright notice. This software is provided "as is" 
 // without express or implied warranty, and with no claim as to its 
 // suitability for any purpose. 
 // For more information, see http://www.boost.org/
 #include <boost/function.hpp>
 #include <iostream>
 float mul_ints(int x, int y) { return ((float)x) * y; }
 struct int_div { 
  float operator()(int x, int y) const { return ((float)x)/y; }; 
 };
 int main()
 {
    boost::function2<float, int, int> f;
    f = int_div();
    std::cout << f(5, 3) << std::endl;
    if (f)
  std::cout << f(5, 3) << std::endl;
 else
  std::cout << "f has no target, so it is unsafe to call" << std::endl;
    f = 0;
    f = &mul_ints;
    return 0;
 }
--- a/test/function_n_test.cpp
+++ b/test/function_n_test.cpp
@ -1,6 +1,6 @@
 // Boost.Function library
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2001, 2002 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -13,8 +13,7 @@
 // For more information, see http://www.boost.org
-#define BOOST_INCLUDE_MAIN
+#include <boost/test/minimal.hpp>
 #include <boost/test/test_tools.hpp>
 #include <boost/function.hpp>
 #include <functional>
 #include <cassert>
@ -65,7 +64,7 @@ test_zero_args()
  func_void_type v1;
  BOOST_TEST(v1.empty());
-  // Assignment to an empty function 
+  // Assignment to an empty function
  v1 = five;
  BOOST_TEST(!v1.empty());
@ -76,7 +75,7 @@ test_zero_args()
  // clear() method
  v1.clear();
-  BOOST_TEST(v1.empty());
+  BOOST_TEST(!v1);
  // Assignment to an empty function
  v1 = three;
@ -93,16 +92,16 @@ test_zero_args()
  // Invocation and self-assignment
  global_int = 0;
-  v1.set(v1);
+  v1 = (v1);
  v1();
  BOOST_TEST(global_int == 5);
-  // clear()
+  // clear
-  v1.clear();
+  v1 = 0;
  BOOST_TEST(v1.empty());
  // Assignment to an empty function from a free function
-  v1 = write_five;
+  v1 = &write_five;
  BOOST_TEST(!v1.empty());
  // Invocation
@ -140,7 +139,7 @@ test_zero_args()
  // Construction from another function (that is empty)
  v1.clear();
  func_void_type v2(v1);
-  BOOST_TEST(!v2);
+  BOOST_TEST(!v2? true : false);
  // Assignment to an empty function
  v2 = three;
@ -152,7 +151,7 @@ test_zero_args()
  BOOST_TEST(global_int == 3);
  // Assignment to a non-empty function
-  v2.set(five);
+  v2 = (five);
  // Invocation
  global_int = 0;
@ -163,8 +162,8 @@ test_zero_args()
  BOOST_TEST(v2.empty());
  // Assignment to an empty function from a free function
-  v2.set(&write_five);
+  v2 = (&write_five);
-  BOOST_TEST(v2);
+  BOOST_TEST(v2? true : false);
  // Invocation
  global_int = 0;
@ -210,8 +209,8 @@ test_zero_args()
  // Assignment to a function from an empty function
  v2 = v1;
-  BOOST_TEST(v2.empty()); 
+  BOOST_TEST(v2.empty());
-  
+
  // Assignment to a function from a function with a functor
  v1 = three;
  v2 = v1;
@ -245,10 +244,10 @@ test_zero_args()
  global_int = 0;
  v3();
  BOOST_TEST(global_int == 5);
-  
+
  // clear() method
  v3.clear();
-  BOOST_TEST(!v3);
+  BOOST_TEST(!v3? true : false);
  // Assignment to an empty function
  v3 = three;
@ -305,7 +304,7 @@ test_zero_args()
  global_int = 0;
  v4();
  BOOST_TEST(global_int == 5);
-  
+
  // clear() method
  v4.clear();
  BOOST_TEST(v4.empty());
@ -365,7 +364,7 @@ test_zero_args()
  global_int = 0;
  v5();
  BOOST_TEST(global_int == 5);
-  
+
  // clear() method
  v5.clear();
  BOOST_TEST(v5.empty());
@ -416,7 +415,7 @@ test_zero_args()
  // Invocation
  global_int = 0;
  v5();
-  BOOST_TEST(global_int == 5);  
+  BOOST_TEST(global_int == 5);
  // Construction of a function from a function
  func_void_type v6(&write_five);
@ -476,21 +475,30 @@ test_zero_args()
  // Invocation
  global_int = 0;
  v6();
-  BOOST_TEST(global_int == 5);  
+  BOOST_TEST(global_int == 5);
  // Const vs. non-const
  write_const_1_nonconst_2 one_or_two;
  const function0<void> v7(one_or_two);
-  function <void> v8(one_or_two);
+  function0<void> v8(one_or_two);
  global_int = 0;
  v7();
  BOOST_TEST(global_int == 2);
-  
+
  global_int = 0;
  v8();
  BOOST_TEST(global_int == 2);
  // Test construction from 0 and comparison to 0
  func_void_type v9(0);
  BOOST_TEST(v9 == 0);
 # if !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x540 || defined(BOOST_STRICT_CONFIG)
  BOOST_TEST(0 == v9);
 #else
  BOOST_TEST(v9.empty());
 #endif
  // Test return values
  typedef function0<int> func_int_type;
  generate_five_obj gen_five;
@ -505,9 +513,9 @@ test_zero_args()
  BOOST_TEST(i0() == 5);
  i0 = &generate_three;
  BOOST_TEST(i0() == 3);
-  BOOST_TEST(i0);
+  BOOST_TEST(i0? true : false);
  i0.clear();
-  BOOST_TEST(!i0);
+  BOOST_TEST(!i0? true : false);
  // Test return values with compatible types
  typedef function0<long> func_long_type;
@ -520,9 +528,9 @@ test_zero_args()
  BOOST_TEST(i1() == 5);
  i1 = &generate_three;
  BOOST_TEST(i1() == 3);
-  BOOST_TEST(i1);
+  BOOST_TEST(i1? true : false);
  i1.clear();
-  BOOST_TEST(!i1);
+  BOOST_TEST(!i1? true : false);
 }
 static void
@ -551,7 +559,7 @@ static void
 test_two_args()
 {
  function2<string, const string&, const string&> cat(&string_cat);
-  BOOST_TEST(cat("str", "ing") == "string");  
+  BOOST_TEST(cat("str", "ing") == "string");
  function2<int, short, short> sum(&sum_ints);
  BOOST_TEST(sum(2, 3) == 5);
@ -586,7 +594,7 @@ test_member_functions()
 {
  boost::function1<int, X*> f1(&X::twice);
-  
+
  X one(1);
  X five(5);
--- a/test/function_ref_cxx98.cpp
+++ b/test/function_ref_cxx98.cpp
@ -0,0 +1,31 @@
 // Function library
 // Copyright (C) 2001-2003 Douglas Gregor
 // Permission to copy, use, sell and distribute this software is granted 
 // provided this copyright notice appears in all copies. Permission to modify 
 // the code and to distribute modified code is granted provided this copyright 
 // notice appears in all copies, and a notice that the code was modified is 
 // included with the copyright notice. This software is provided "as is" 
 // without express or implied warranty, and with no claim as to its 
 // suitability for any purpose. 
 // For more information, see http://www.boost.org/
 #include <boost/function.hpp>
 #include <iostream>
 struct stateful_type { int operator()(int) const { return 0; } };
 int main()
 {
    stateful_type a_function_object;
  boost::function<int (int)> f;
  f = boost::ref(a_function_object);
  boost::function<int (int)> f2(f);
    return 0;
 }
--- a/test/function_ref_portable.cpp
+++ b/test/function_ref_portable.cpp
@ -0,0 +1,31 @@
 // Function library
 // Copyright (C) 2001-2003 Douglas Gregor
 // Permission to copy, use, sell and distribute this software is granted 
 // provided this copyright notice appears in all copies. Permission to modify 
 // the code and to distribute modified code is granted provided this copyright 
 // notice appears in all copies, and a notice that the code was modified is 
 // included with the copyright notice. This software is provided "as is" 
 // without express or implied warranty, and with no claim as to its 
 // suitability for any purpose. 
 // For more information, see http://www.boost.org/
 #include <boost/function.hpp>
 #include <iostream>
 struct stateful_type { int operator()(int) const { return 0; } };
 int main()
 {
    stateful_type a_function_object;
  boost::function1<int, int> f;
  f = boost::ref(a_function_object);
  boost::function1<int, int> f2(f);
    return 0;
 }
--- a/test/function_test.cpp
+++ b/test/function_test.cpp
@ -1,6 +1,6 @@
 // Boost.Function library
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2001, 2002 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -13,16 +13,15 @@
 // For more information, see http://www.boost.org
-#define BOOST_INCLUDE_MAIN
+#include <boost/test/minimal.hpp>
 #include <boost/test/test_tools.hpp>
 #include <boost/function.hpp>
 #include <functional>
 #include <cassert>
 #include <string>
 #include <utility>
 using namespace boost;
-using std::string;
+using namespace std;
 using std::negate;
 int global_int;
@ -56,7 +55,7 @@ struct add_to_obj
 static void
 test_zero_args()
 {
-  typedef function<void> func_void_type;
+  typedef function<void ()> func_void_type;
  write_five_obj five;
  write_three_obj three;
@ -65,9 +64,9 @@ test_zero_args()
  func_void_type v1;
  BOOST_TEST(v1.empty());
-  // Assignment to an empty function 
+  // Assignment to an empty function
  v1 = five;
-  BOOST_TEST(!v1.empty());
+  BOOST_TEST(v1 != 0);
  // Invocation of a function
  global_int = 0;
@ -76,7 +75,7 @@ test_zero_args()
  // clear() method
  v1.clear();
-  BOOST_TEST(v1.empty());
+  BOOST_TEST(v1 == 0);
  // Assignment to an empty function
  v1 = three;
@ -93,17 +92,17 @@ test_zero_args()
  // Invocation and self-assignment
  global_int = 0;
-  v1.set(v1);
+  v1 = (v1);
  v1();
  BOOST_TEST(global_int == 5);
-  // clear()
+  // clear
-  v1.clear();
+  v1 = 0;
-  BOOST_TEST(v1.empty());
+  BOOST_TEST(0 == v1);
  // Assignment to an empty function from a free function
  v1 = BOOST_FUNCTION_TARGET_FIX(&) write_five;
-  BOOST_TEST(!v1.empty());
+  BOOST_TEST(0 != v1);
  // Invocation
  global_int = 0;
@ -140,7 +139,7 @@ test_zero_args()
  // Construction from another function (that is empty)
  v1.clear();
  func_void_type v2(v1);
-  BOOST_TEST(!v2);
+  BOOST_TEST(!v2? true : false);
  // Assignment to an empty function
  v2 = three;
@ -152,7 +151,7 @@ test_zero_args()
  BOOST_TEST(global_int == 3);
  // Assignment to a non-empty function
-  v2.set(five);
+  v2 = (five);
  // Invocation
  global_int = 0;
@ -163,8 +162,8 @@ test_zero_args()
  BOOST_TEST(v2.empty());
  // Assignment to an empty function from a free function
-  v2.set(BOOST_FUNCTION_TARGET_FIX(&) write_five);
+  v2 = (BOOST_FUNCTION_TARGET_FIX(&) write_five);
-  BOOST_TEST(v2);
+  BOOST_TEST(v2? true : false);
  // Invocation
  global_int = 0;
@ -210,8 +209,8 @@ test_zero_args()
  // Assignment to a function from an empty function
  v2 = v1;
-  BOOST_TEST(v2.empty()); 
+  BOOST_TEST(v2.empty());
-  
+
  // Assignment to a function from a function with a functor
  v1 = three;
  v2 = v1;
@ -245,10 +244,10 @@ test_zero_args()
  global_int = 0;
  v3();
  BOOST_TEST(global_int == 5);
-  
+
  // clear() method
  v3.clear();
-  BOOST_TEST(!v3);
+  BOOST_TEST(!v3? true : false);
  // Assignment to an empty function
  v3 = three;
@ -305,7 +304,7 @@ test_zero_args()
  global_int = 0;
  v4();
  BOOST_TEST(global_int == 5);
-  
+
  // clear() method
  v4.clear();
  BOOST_TEST(v4.empty());
@ -365,7 +364,7 @@ test_zero_args()
  global_int = 0;
  v5();
  BOOST_TEST(global_int == 5);
-  
+
  // clear() method
  v5.clear();
  BOOST_TEST(v5.empty());
@ -416,7 +415,7 @@ test_zero_args()
  // Invocation
  global_int = 0;
  v5();
-  BOOST_TEST(global_int == 5);  
+  BOOST_TEST(global_int == 5);
  // Construction of a function from a function
  func_void_type v6(&write_five);
@ -476,23 +475,28 @@ test_zero_args()
  // Invocation
  global_int = 0;
  v6();
-  BOOST_TEST(global_int == 5);  
+  BOOST_TEST(global_int == 5);
  // Const vs. non-const
  write_const_1_nonconst_2 one_or_two;
-  const function<void> v7(one_or_two);
+  const function<void ()> v7(one_or_two);
-  function <void> v8(one_or_two);
+  function<void ()> v8(one_or_two);
  global_int = 0;
  v7();
  BOOST_TEST(global_int == 2);
-  
+
  global_int = 0;
  v8();
  BOOST_TEST(global_int == 2);
  // Test construction from 0 and comparison to 0
  func_void_type v9(0);
  BOOST_TEST(v9 == 0);
  BOOST_TEST(0 == v9);
  // Test return values
-  typedef function<int> func_int_type;
+  typedef function<int ()> func_int_type;
  generate_five_obj gen_five;
  generate_three_obj gen_three;
@ -505,12 +509,12 @@ test_zero_args()
  BOOST_TEST(i0() == 5);
  i0 = &generate_three;
  BOOST_TEST(i0() == 3);
-  BOOST_TEST(i0);
+  BOOST_TEST(i0? true : false);
  i0.clear();
-  BOOST_TEST(!i0);
+  BOOST_TEST(!i0? true : false);
  // Test return values with compatible types
-  typedef function<long> func_long_type;
+  typedef function<long ()> func_long_type;
  func_long_type i1(gen_five);
  BOOST_TEST(i1() == 5);
@ -520,9 +524,9 @@ test_zero_args()
  BOOST_TEST(i1() == 5);
  i1 = &generate_three;
  BOOST_TEST(i1() == 3);
-  BOOST_TEST(i1);
+  BOOST_TEST(i1? true : false);
  i1.clear();
-  BOOST_TEST(!i1);
+  BOOST_TEST(!i1? true : false);
 }
 static void
@ -530,44 +534,44 @@ test_one_arg()
 {
  negate<int> neg;
-  function<int, int> f1(neg);
+  function<int (int)> f1(neg);
  BOOST_TEST(f1(5) == -5);
-  function<string, string> id(&identity_str);
+  function<string (string)> id(&identity_str);
  BOOST_TEST(id("str") == "str");
-  function<std::string, const char*> id2(&identity_str);
+  function<string (const char*)> id2(&identity_str);
  BOOST_TEST(id2("foo") == "foo");
  add_to_obj add_to(5);
-  function<int, int> f2(add_to);
+  function<int (int)> f2(add_to);
  BOOST_TEST(f2(3) == 8);
-  const function<int, int> cf2(add_to);
+  const function<int (int)> cf2(add_to);
  BOOST_TEST(cf2(3) == 8);
 }
 static void
 test_two_args()
 {
-  function<string, const string&, const string&> cat(&string_cat);
+  function<string (const string&, const string&)> cat(&string_cat);
-  BOOST_TEST(cat("str", "ing") == "string");  
+  BOOST_TEST(cat("str", "ing") == "string");
-  function<int, short, short> sum(&sum_ints);
+  function<int (short, short)> sum(&sum_ints);
  BOOST_TEST(sum(2, 3) == 5);
 }
 static void
 test_emptiness()
 {
-  function<float> f1;
+  function<float ()> f1;
  BOOST_TEST(f1.empty());
-  function<float> f2;
+  function<float ()> f2;
  f2 = f1;
  BOOST_TEST(f2.empty());
-  function<double> f3;
+  function<double ()> f3;
  f3 = f2;
  BOOST_TEST(f3.empty());
 }
@ -584,21 +588,21 @@ struct X {
 static void
 test_member_functions()
 {
-  boost::function<int, X*> f1(&X::twice);
+  boost::function<int (X*)> f1(&X::twice);
-  
+
  X one(1);
  X five(5);
  BOOST_TEST(f1(&one) == 2);
  BOOST_TEST(f1(&five) == 10);
-  boost::function<int, X*> f1_2;
+  boost::function<int (X*)> f1_2;
  f1_2 = &X::twice;
  BOOST_TEST(f1_2(&one) == 2);
  BOOST_TEST(f1_2(&five) == 10);
-  boost::function<int, X&, int> f2(&X::plus);
+  boost::function<int (X&, int)> f2(&X::plus);
  BOOST_TEST(f2(one, 3) == 4);
  BOOST_TEST(f2(five, 4) == 9);
 }
@ -610,12 +614,12 @@ struct add_with_throw_on_copy {
  add_with_throw_on_copy(const add_with_throw_on_copy&)
  {
-    throw std::runtime_error("But this CAN'T throw");
+    throw runtime_error("But this CAN'T throw");
  }
  add_with_throw_on_copy& operator=(const add_with_throw_on_copy&)
  {
-    throw std::runtime_error("But this CAN'T throw");
+    throw runtime_error("But this CAN'T throw");
  }
 };
@ -624,14 +628,115 @@ test_ref()
 {
  add_with_throw_on_copy atc;
  try {
-    boost::function<int, int, int> f(ref(atc));
+    boost::function<int (int, int)> f(ref(atc));
    BOOST_TEST(f(1, 3) == 4);
  }
-  catch(std::runtime_error e) {
+  catch(runtime_error e) {
    BOOST_ERROR("Nonthrowing constructor threw an exception");
  }
 }
 static int alloc_count = 0;
 static int dealloc_count = 0;
 template<typename T>
 struct counting_allocator : public allocator<T>
 {
  template<typename U>
  struct rebind
  {
    typedef counting_allocator<U> other;
  };
  T* allocate(size_t n)
  {
    alloc_count++;
    return allocator<T>::allocate(n);
  }
  void deallocate(T* p, size_t n)
  {
    dealloc_count++;
    allocator<T>::deallocate(p, n);
  }
 };
 static int do_minus(int x, int y) { return x-y; }
 struct DoNothing
 {
  void operator()() const {}
 };
 static void do_nothing() {}
 static void test_allocator()
 {
 #ifndef BOOST_NO_STD_ALLOCATOR
  boost::function<int (int, int), counting_allocator<int> > f;
  f = plus<int>();
  f.clear();
  BOOST_TEST(alloc_count == 1);
  BOOST_TEST(dealloc_count == 1);
  alloc_count = 0;
  dealloc_count = 0;
  f = &do_minus;
  f.clear();
  boost::function<void (), counting_allocator<int> > fv;
  alloc_count = 0;
  dealloc_count = 0;
  fv = DoNothing();
  fv.clear();
  BOOST_TEST(alloc_count == 1);
  BOOST_TEST(dealloc_count == 1);
  alloc_count = 0;
  dealloc_count = 0;
  fv = &do_nothing;
  fv.clear();
 #endif // ndef BOOST_NO_STD_ALLOCATOR
 }
 static void test_exception()
 {
  boost::function<int (int, int)> f;
  try {
    f(5, 4);
    BOOST_TEST(false);
  }
  catch(boost::bad_function_call) {
    // okay
  }
 }
 typedef boost::function< void * (void * reader) > reader_type;
 typedef std::pair<int, reader_type> mapped_type;
 static void test_implicit()
 {
  mapped_type m;
  m = mapped_type();
 }
 static void test_call_obj(boost::function<int (int, int)> f)
 {
  assert(!f.empty());
 }
 static void test_call_cref(const boost::function<int (int, int)>& f)
 {
  assert(!f.empty());
 }
 static void test_call()
 {
  test_call_obj(std::plus<int>());
  test_call_cref(std::plus<int>());
 }
 int test_main(int, char* [])
 {
  test_zero_args();
@ -640,6 +745,10 @@ int test_main(int, char* [])
  test_emptiness();
  test_member_functions();
  test_ref();
  test_allocator();
  test_exception();
  test_implicit();
  test_call();
  return 0;
 }
--- a/test/function_test_fail1.cpp
+++ b/test/function_test_fail1.cpp
@ -23,8 +23,8 @@ using namespace boost;
 int
 test_main(int, char*[])
 {
-  function<int> f1;
+  function0<int> f1;
-  function<int> f2;
+  function0<int> f2;
  if (f1 == f2) {
  }
--- a/test/function_test_fail2.cpp
+++ b/test/function_test_fail2.cpp
@ -25,7 +25,7 @@ static int bad_fn(float f) { return static_cast<int>(f); }
 int
 test_main(int, char*[])
 {
-  function<int> f1;
+  function0<int> f1;
  f1 = bad_fn;
  BOOST_CRITICAL_ERROR("This should not have compiled.");
--- a/test/lambda_test.cpp
+++ b/test/lambda_test.cpp
@ -1,6 +1,6 @@
 // Boost.Function library
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
+// Copyright (C) 2002-2003 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
@ -13,35 +13,32 @@
 // For more information, see http://www.boost.org
 #define BOOST_INCLUDE_MAIN
 #include <boost/test/test_tools.hpp>
 #include <cassert>
 #include <iostream>
-#include <functional>
+#include <cstdlib>
 #include <boost/test/test_tools.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/lambda/bind.hpp>
 #include <boost/function.hpp>
 using namespace std;
 using namespace boost;
 using namespace boost::lambda;
-struct counting_policy
+static unsigned
 func_impl(int arg1, bool arg2, double arg3)
 {
-  static int count;
+  return abs (static_cast<int>((arg2 ? arg1 : 2 * arg1) * arg3));
 }
-  void precall(const function_base*) { count++; }
+int test_main(int, char*[])
  void postcall(const function_base*) { count+=2; }
 };
 int counting_policy::count = 0;
 int
 test_main(int, char*[])
 {
-  function<int, int, int>::policy<counting_policy>::type f; 
+  function <unsigned(bool, double)> f1 = bind(func_impl, 15, _1, _2);
  function <unsigned(double)>       f2 = bind(f1, false, _1);
  function <unsigned()>             f3 = bind(f2, 4.0);
-  f = plus<int>();
+  f3();
  BOOST_TEST(5 == f(2,3));
  BOOST_TEST(counting_policy::count==3);
  return 0;
 }
--- a/test/mem_fun_cxx98.cpp
+++ b/test/mem_fun_cxx98.cpp
@ -0,0 +1,35 @@
 // Function library
 // Copyright (C) 2001-2003 Douglas Gregor
 // Permission to copy, use, sell and distribute this software is granted 
 // provided this copyright notice appears in all copies. Permission to modify 
 // the code and to distribute modified code is granted provided this copyright 
 // notice appears in all copies, and a notice that the code was modified is 
 // included with the copyright notice. This software is provided "as is" 
 // without express or implied warranty, and with no claim as to its 
 // suitability for any purpose. 
 // For more information, see http://www.boost.org/
 #include <boost/function.hpp>
 #include <iostream>
 #include <functional>
 struct X {
  int foo(int);
 };
 int X::foo(int x) { return -x; }
 int main()
 {
    boost::function<int (X*, int)> f;
 f = &X::foo;
 X x;
 f(&x, 5);
    return 0;
 }
--- a/test/mem_fun_portable.cpp
+++ b/test/mem_fun_portable.cpp
@ -0,0 +1,35 @@
 // Function library
 // Copyright (C) 2001-2003 Douglas Gregor
 // Permission to copy, use, sell and distribute this software is granted 
 // provided this copyright notice appears in all copies. Permission to modify 
 // the code and to distribute modified code is granted provided this copyright 
 // notice appears in all copies, and a notice that the code was modified is 
 // included with the copyright notice. This software is provided "as is" 
 // without express or implied warranty, and with no claim as to its 
 // suitability for any purpose. 
 // For more information, see http://www.boost.org/
 #include <boost/function.hpp>
 #include <iostream>
 #include <functional>
 struct X {
  int foo(int);
 };
 int X::foo(int x) { return -x; }
 int main()
 {
    boost::function2<int, X*, int> f;
 f = &X::foo;
 X x;
 f(&x, 5);
    return 0;
 }
--- a/test/mixin_test.cpp
+++ b/test/mixin_test.cpp
@ -1,60 +0,0 @@
 // Boost.Function library
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
 // provided this copyright notice appears in all copies.
 // Permission to modify the code and to distribute modified code is granted
 // provided this copyright notice appears in all copies, and a notice
 // that the code was modified is included with the copyright notice.
 //
 // This software is provided "as is" without express or implied warranty,
 // and with no claim as to its suitability for any purpose.
 // For more information, see http://www.boost.org
 #define BOOST_INCLUDE_MAIN
 #include <boost/test/test_tools.hpp>
 #include <cassert>
 #include <functional>
 #include <boost/function.hpp>
 struct id_mixin
 {       
  id_mixin(const id_mixin& rhs) : id(rhs.id) {}
  id_mixin& operator=(const id_mixin& rhs){id = rhs.id; return *this;}
  id_mixin(int i = 0){ id = i;}
  int id;
 };
 static int do_plus(int x, int y) { return x+y; }
 typedef boost::function<int,int,int>::mixin<id_mixin>::type func;
 int test_main(int, char*[])
 {
  func f(id_mixin(3));  
  f = std::plus<int>();
  BOOST_TEST(f.id == 3);
  f = &do_plus;
  BOOST_TEST(f.id == 3);
  f.clear();
  f.id = 7;    
  BOOST_TEST(f.id == 7);
  func g(f);
  BOOST_TEST(g.id == 7);
  f.id = 21;    
  BOOST_TEST(f.id == 21);
  boost::swap(f,g);  
  BOOST_TEST(f.id == 7);
  BOOST_TEST(g.id == 21);
  g = f;          
  BOOST_TEST(g.id == 7);  
  return 0;
 }
--- a/test/stateless_test.cpp
+++ b/test/stateless_test.cpp
@ -24,9 +24,10 @@ struct stateless_integer_add {
  void* operator new(std::size_t, stateless_integer_add*)
  {
    throw std::runtime_error("Cannot allocate a stateless_integer_add");
    return 0; // suppress warnings
  }
-  void operator delete(void*, stateless_integer_add*)
+  void operator delete(void*, stateless_integer_add*) throw()
  {
  }
 };
@ -40,7 +41,7 @@ namespace boost {
 int test_main(int, char*[])
 {
-  boost::function<int, int, int> f;
+  boost::function2<int, int, int> f;
  f = stateless_integer_add();
  return 0;
--- a/test/std_bind_cxx98.cpp
+++ b/test/std_bind_cxx98.cpp
@ -0,0 +1,34 @@
 // Function library
 // Copyright (C) 2001-2003 Douglas Gregor
 // Permission to copy, use, sell and distribute this software is granted 
 // provided this copyright notice appears in all copies. Permission to modify 
 // the code and to distribute modified code is granted provided this copyright 
 // notice appears in all copies, and a notice that the code was modified is 
 // included with the copyright notice. This software is provided "as is" 
 // without express or implied warranty, and with no claim as to its 
 // suitability for any purpose. 
 // For more information, see http://www.boost.org/
 #include <boost/function.hpp>
 #include <iostream>
 #include <functional>
 struct X {
  int foo(int);
 };
 int X::foo(int x) { return -x; }
 int main()
 {
      boost::function<int (int)> f;
  X x;
  f = std::bind1st(
        std::mem_fun(&X::foo), &x);
  f(5); // Call x.foo(5)
    return 0;
 }
--- a/test/std_bind_portable.cpp
+++ b/test/std_bind_portable.cpp
@ -0,0 +1,34 @@
 // Function library
 // Copyright (C) 2001-2003 Douglas Gregor
 // Permission to copy, use, sell and distribute this software is granted 
 // provided this copyright notice appears in all copies. Permission to modify 
 // the code and to distribute modified code is granted provided this copyright 
 // notice appears in all copies, and a notice that the code was modified is 
 // included with the copyright notice. This software is provided "as is" 
 // without express or implied warranty, and with no claim as to its 
 // suitability for any purpose. 
 // For more information, see http://www.boost.org/
 #include <boost/function.hpp>
 #include <iostream>
 #include <functional>
 struct X {
  int foo(int);
 };
 int X::foo(int x) { return -x; }
 int main()
 {
      boost::function1<int, int> f;
  X x;
  f = std::bind1st(
        std::mem_fun(&X::foo), &x);
  f(5); // Call x.foo(5)
    return 0;
 }
--- a/test/sum_avg_cxx98.cpp
+++ b/test/sum_avg_cxx98.cpp
@ -0,0 +1,32 @@
 // Function library
 // Copyright (C) 2001-2003 Douglas Gregor
 // Permission to copy, use, sell and distribute this software is granted 
 // provided this copyright notice appears in all copies. Permission to modify 
 // the code and to distribute modified code is granted provided this copyright 
 // notice appears in all copies, and a notice that the code was modified is 
 // included with the copyright notice. This software is provided "as is" 
 // without express or implied warranty, and with no claim as to its 
 // suitability for any purpose. 
 // For more information, see http://www.boost.org/
 #include <boost/function.hpp>
 #include <iostream>
 void do_sum_avg(int values[], int n, int& sum, float& avg)
 {
  sum = 0;
  for (int i = 0; i < n; i++)
    sum += values[i];
  avg = (float)sum / n;
 }
 int main()
 {
    boost::function<void (int values[], int n, int& sum, float& avg)> sum_avg;
    sum_avg = &do_sum_avg;
    return 0;
 }
--- a/test/sum_avg_portable.cpp
+++ b/test/sum_avg_portable.cpp
@ -0,0 +1,32 @@
 // Function library
 // Copyright (C) 2001-2003 Douglas Gregor
 // Permission to copy, use, sell and distribute this software is granted 
 // provided this copyright notice appears in all copies. Permission to modify 
 // the code and to distribute modified code is granted provided this copyright 
 // notice appears in all copies, and a notice that the code was modified is 
 // included with the copyright notice. This software is provided "as is" 
 // without express or implied warranty, and with no claim as to its 
 // suitability for any purpose. 
 // For more information, see http://www.boost.org/
 #include <boost/function.hpp>
 #include <iostream>
 void do_sum_avg(int values[], int n, int& sum, float& avg)
 {
  sum = 0;
  for (int i = 0; i < n; i++)
    sum += values[i];
  avg = (float)sum / n;
 }
 int main()
 {
    boost::function4<void, int[], int, int&, float&> sum_avg;
    sum_avg = &do_sum_avg;
    return 0;
 }
Author	SHA1	Message	Date
nobody	e1e08b9e18	This commit was manufactured by cvs2svn to create tag 'Version_1_30_2'. [SVN r19685]	2003-08-18 18:40:31 +00:00
Douglas Gregor	4d72eca731	Stupid fix, from mainline [SVN r19490]	2003-08-08 22:15:43 +00:00
Douglas Gregor	e086508843	VC 7.1 does not handle the operator== conversions correctly, either [SVN r19177]	2003-07-18 04:04:54 +00:00
Douglas Gregor	709b299cea	Update Borland C++ version number in enable_if check [SVN r19176]	2003-07-18 04:00:02 +00:00
nobody	93f11e94e2	This commit was manufactured by cvs2svn to create branch 'RC_1_30_0'. [SVN r17693]	2003-03-01 19:43:06 +00:00
Douglas Gregor	652955dee5	The old HTML Function documentation has been removed. The file index.html redirects to $BOOST_ROOT/doc/html/function.html, the new home for the Function library documentation [SVN r17467]	2003-02-17 04:43:49 +00:00
Douglas Gregor	a44c07104c	Regenerated, with function_test renamed to lib_function_test [SVN r17420]	2003-02-14 18:15:01 +00:00
Douglas Gregor	af75e6622e	Regenerated, with license and copyright info [SVN r17419]	2003-02-14 18:05:26 +00:00
Douglas Gregor	07f4c425e3	Workaround for a Visual Age C++ preprocessor issue [SVN r17407]	2003-02-14 15:34:39 +00:00
Douglas Gregor	25d109144d	Don't omit template parameter names (Markus Schöpflin) [SVN r17333]	2003-02-12 18:46:12 +00:00
Douglas Gregor	6ac619c12b	Lots o' copyright statements [SVN r17265]	2003-02-07 14:03:37 +00:00
Beman Dawes	c76d87f4ad	rename function_test to lib_function_test due to clash file libs/functional [SVN r17141]	2003-01-31 23:56:11 +00:00
Douglas Gregor	eb8a563a3b	Suppress warnings on HP aCC [SVN r17089]	2003-01-30 14:25:00 +00:00
Douglas Gregor	300ca5bdef	Delete nothrow, new throw [SVN r17088]	2003-01-30 14:22:28 +00:00
Douglas Gregor	9bc263cf97	Regenerated [SVN r17084]	2003-01-30 04:42:06 +00:00
Douglas Gregor	8b6ebc4c42	>> std::endl; is bad :) [SVN r17078]	2003-01-29 13:49:14 +00:00
Dave Abrahams	3cb116cf11	aCC workaround [SVN r16975]	2003-01-21 13:54:27 +00:00
Douglas Gregor	09657f1134	Fixed broken testcases that came from tutorial sample code [SVN r16935]	2003-01-19 14:44:34 +00:00
Douglas Gregor	4a46b5e1b9	Generated from XML [SVN r16929]	2003-01-18 15:07:06 +00:00
Douglas Gregor	951cb3acd4	Testcases autogenerated from the Boost.Function tutorial [SVN r16711]	2002-12-28 03:44:00 +00:00
Beman Dawes	3b644dbfff	add or update See www.boost.org comments [SVN r16708]	2002-12-27 16:51:53 +00:00
Douglas Gregor	d6659e26d7	function_base.hpp: Borland's new update has the same enable_if bug [SVN r16678]	2002-12-22 14:28:29 +00:00
Douglas Gregor	535612ec85	function_base.hpp: - Use BOOST_WORKAROUND more - Borland C++ 5.5 update 2 doesn't support enable_if - MSVC 7.0 needs the comparison-with-zero workarounds [SVN r16636]	2002-12-17 13:50:07 +00:00
Douglas Gregor	c4451e5a64	Remove MSVC-specific hack [SVN r16626]	2002-12-16 22:48:07 +00:00
Douglas Gregor	a75e20c3ed	Support comparisons against 0 on MSVC [SVN r16618]	2002-12-15 16:05:01 +00:00
Douglas Gregor	b62c8066a3	Forward-declare function_base for use in the allocator [SVN r16617]	2002-12-15 15:20:28 +00:00
Douglas Gregor	30917e9f6a	MIPSpro's library needs to use allocator<function_base>, not allocator<void> [SVN r16616]	2002-12-15 15:13:51 +00:00
Douglas Gregor	b8d3e01e42	Removed enable_if checks: the same syntax is supported regardless of support for enable_if [SVN r16615]	2002-12-15 14:55:07 +00:00
Douglas Gregor	450959d0d7	Use boost/assert.hpp to check (at runtime) if the int passed to Boost.Function's clearing constructor is zero [SVN r16614]	2002-12-15 14:54:32 +00:00
Douglas Gregor	da9d12d1b9	function_template.hpp: - When enable_if is not supported, supply an int version of the constructor and assignment operator so that the '= 0' or construct-with-0 syntax is usable [SVN r16613]	2002-12-15 14:51:16 +00:00
Douglas Gregor	4466a7c9c0	function_base.hpp: - GCC 3.0 and later do support enable_if. Not sure what happened there... - Use BOOST_WORKAROUND in some places (more to come...) [SVN r16612]	2002-12-15 14:45:13 +00:00
Douglas Gregor	1e262bc976	function_n_test.cpp: Add a missing #endif [SVN r16595]	2002-12-12 13:44:04 +00:00
Douglas Gregor	b58acb02e3	BOOST_NO_CONFIG -> BOOST_STRICT_CONFIG (Dave Abrahams) [SVN r16524]	2002-12-05 12:28:19 +00:00
Dave Abrahams	06539c093f	Suppress warnings on HP aCC [SVN r16515]	2002-12-04 16:19:39 +00:00
Dave Abrahams	949a459d8a	SunPro CC workaround [SVN r16514]	2002-12-04 16:18:31 +00:00
Dave Abrahams	4cc84aff24	Disable function-type partial specializations for SunPro [SVN r16512]	2002-12-04 15:55:34 +00:00
Dave Abrahams	9cf5e8efbe	Workaround Sun and HP bugs [SVN r16511]	2002-12-04 15:54:33 +00:00
Douglas Gregor	17427dfa3b	Borland C++ 5.6.0 doesn't handle enable_if [SVN r16262]	2002-11-15 19:26:39 +00:00
Douglas Gregor	7dcd9cd224	Metrowerks 7.2 can't handle enable_if [SVN r16226]	2002-11-13 21:00:23 +00:00
Douglas Gregor	f54bd9f08d	function_template.hpp: - Wrap ICEs in parentheses when used as template arguments [SVN r16225]	2002-11-13 18:03:55 +00:00
Douglas Gregor	7baa23912d	Fix on BCC 5.6.1 (Hugo Duncan) [SVN r16216]	2002-11-12 22:36:29 +00:00
Douglas Gregor	79fca4d1b2	MSVC 7.0 broken. Go figure [SVN r16179]	2002-11-09 21:05:46 +00:00
Douglas Gregor	18d09833f7	Neither MSVC nor Borland can handle enable_if. Big surprise. [SVN r16177]	2002-11-09 17:16:24 +00:00
Douglas Gregor	aa2c2520ad	Make sure to pass the address of a function to Boost.Function, not the function itself (stupid MSVC) [SVN r16176]	2002-11-09 17:12:45 +00:00
Douglas Gregor	5574a6e97d	MIPSpro 7.3.1.3m can't support enable_if [SVN r16175]	2002-11-09 16:26:47 +00:00
Douglas Gregor	17b311cbbd	Support assignment from 0, construction from 0, and comparison to zero. [SVN r16174]	2002-11-09 16:02:47 +00:00
Douglas Gregor	4fed545468	function_n_test.cpp: - Don't test == 0 syntax (it isn't supported) [SVN r16115]	2002-11-05 14:36:49 +00:00
Douglas Gregor	17ded4b8bf	- Added sig member template support for Boost.Lambda, with testcase (Michael Hohmuth) - Removed the assignment-to-zero attempt - Added bad_function_call exception (using boost::throw_exception) [SVN r16102]	2002-11-04 18:19:01 +00:00
Douglas Gregor	9a09d9e044	index.html: Make valid HTML 4.01 [SVN r15839]	2002-10-10 05:40:42 +00:00
Douglas Gregor	374711d2c6	function_template.hpp: - function partial specialization now allows assignment to zero (for clearing) and comparison against zero (for the empty check) (Brad King) function_test.cpp: - Check comparison against zero - Check assignment to zero function_test_fail1.cpp: function_test_fail2.cpp: - Make them fail for the right reasons [SVN r15803]	2002-10-08 02:32:38 +00:00
Ralf W. Grosse-Kunstleve	300fde19a1	namespace name in the MIPSpro workaround corrected [SVN r15516]	2002-09-25 20:02:31 +00:00
Douglas Gregor	8f578dbc78	function_template.hpp: - Don't let Borland C++ use class template function function_base.hpp: - Work around freaky MIPSpro bug that affects the Python lib [SVN r15514]	2002-09-25 18:10:32 +00:00
Douglas Gregor	e3386d8e7e	Fixes for MSVC 6.0sp5 [SVN r15502]	2002-09-25 03:30:18 +00:00
Douglas Gregor	68d6a1354e	function_template.hpp: - Remove tabs prologue.hpp: - get BOOST_PP_INC [SVN r15501]	2002-09-24 19:52:56 +00:00
Douglas Gregor	6c8e07793d	function_base.hpp: - make make_any_pointer inline [SVN r15500]	2002-09-24 19:27:51 +00:00
Douglas Gregor	8b6f154891	function_base.hpp: - Don't try to implicitly convert a function pointer to a data pointer stateless_test.cpp: - Don't use the deprecated syntax [SVN r15499]	2002-09-24 17:28:58 +00:00
Douglas Gregor	f9ae459b2d	- Removed everything deprecated in 1.29.0 - Deprecate user use of function_base - Use the Boost Preprocessor library to make Function scalable to any (reasonable) number of arguments - Make any_pointer a POD (oops) - Test Boost.Function for 30 arguments - Remove tests of deprecated features [SVN r15498]	2002-09-24 17:16:17 +00:00
Douglas Gregor	f36e83fb27	function_base.hpp: - Remove safe_bool conversion and operator! from class function_base function_template.hpp: - Add safe_bool conversion and operator! - operator! returns bool, not safe_bool (Peter Dimov) reference.html: - Document above change [SVN r15356]	2002-09-16 03:44:18 +00:00
Douglas Gregor	e16a46fbe8	Added argI_type typedefs Added arity ICE [SVN r15184]	2002-09-06 18:47:59 +00:00
Douglas Gregor	ab1228c279	reference.html: - Document argI_type typedefs - Document arity ICE [SVN r15183]	2002-09-06 18:47:32 +00:00
Douglas Gregor	1b848e15b7	? true : false trick, again [SVN r14892]	2002-08-15 15:15:50 +00:00
Douglas Gregor	3e2a2b6c55	? true : false hack [SVN r14874]	2002-08-15 03:22:31 +00:00
Douglas Gregor	893069311a	function_base.hpp: - Use the BOOST_FUNCTION_SILENT_DEPRECATED macro as a signal to turn off all "deprecated" warnings [SVN r14756]	2002-08-09 14:34:23 +00:00
Douglas Gregor	0db4ad9f55	Attempted Borland fix [SVN r14709]	2002-08-06 14:20:08 +00:00
Douglas Gregor	d59b93384b	Report success on Compaq cxx 6.2 [SVN r14697]	2002-08-05 15:07:34 +00:00
Douglas Gregor	e837b20127	Report the sad fate of CodeWarrior [SVN r14696]	2002-08-05 15:05:57 +00:00
Douglas Gregor	39e2be08cb	Don't test allocators if they aren't supported [SVN r14695]	2002-08-05 15:05:34 +00:00
Douglas Gregor	021063eddf	Attempted fix for Compaq CXX 6.2 [SVN r14693]	2002-08-05 13:32:25 +00:00
Douglas Gregor	0ff1daa573	Proper HTML, please [SVN r14690]	2002-08-05 06:29:07 +00:00
Douglas Gregor	8b734dac5a	Added Sun CC to the bad side of the syntax table [SVN r14689]	2002-08-05 06:24:18 +00:00
Douglas Gregor	5010a0beb0	tutorial.html: - Use tables to show both preferred/compatible syntaxes - Include a table describing which syntax is right for each compiler [SVN r14687]	2002-08-05 06:20:30 +00:00
Douglas Gregor	39687e1a05	Describe BOOST_FUNCTION_NO_DEPRECATED [SVN r14686]	2002-08-05 06:19:47 +00:00
Douglas Gregor	688df3d137	function_base.hpp: - Use <boost/pending/ct_if.hpp> all: - Add BOOST_FUNCTION_NO_DEPRECATED macro hackery to get rid of ALL deprecated features [SVN r14685]	2002-08-05 06:19:17 +00:00
Douglas Gregor	232069aa00	allocator_test.cpp: - Remove partial specialization-specific code function_test.cpp: - Uses BOOST_FUNCTION_NO_DEPRECATED - Use only the new syntax - Test the allocator parameter deprecated_syntax_test.cpp: - Test the deprecated syntax [SVN r14684]	2002-08-05 06:13:32 +00:00
Douglas Gregor	694ebbb301	Use built-in deprecation facilities, when available [SVN r14677]	2002-08-05 03:08:08 +00:00
Douglas Gregor	837591456f	Remove the unused is_not_same [SVN r14676]	2002-08-05 02:34:02 +00:00
Douglas Gregor	2d8a4b136a	Use function_traits in type_traits library [SVN r14675]	2002-08-05 02:33:26 +00:00
Douglas Gregor	4f5147f96e	function.hpp: - When determining if a type is a function type, don't blindly add a pointer but instead use add_pointer [SVN r14586]	2002-07-24 13:27:49 +00:00
Douglas Gregor	9db8577d16	Removed all of the deprecated parameters and made them variables [SVN r14578]	2002-07-23 21:57:57 +00:00
Douglas Gregor	2963cb89a8	function_test.cpp: Don't use void() directly because of broken compilers [SVN r14571]	2002-07-23 13:47:01 +00:00
Dave Abrahams	d62193624e	VC6/7 workaround [SVN r14552]	2002-07-21 11:09:23 +00:00
Douglas Gregor	461e51a592	Expand on the compatibility note [SVN r14542]	2002-07-19 21:21:56 +00:00
Douglas Gregor	7ad9e2afee	Tutorial now describes the new syntax (and the old syntax) [SVN r14541]	2002-07-19 21:18:01 +00:00
Douglas Gregor	e9ce99dede	test/function_n_test.cpp: test/function_test.cpp: - Don't use deprecated functions index.html: doc/reference.html: - Describe deprecations [SVN r14540]	2002-07-19 20:45:36 +00:00
Douglas Gregor	3264064074	Removed some cruft Deprecated the 'set' methods [SVN r14538]	2002-07-19 20:09:29 +00:00
Douglas Gregor	84bdb40567	Don't test new syntax if partial specialization is unavailable [SVN r14536]	2002-07-19 19:42:25 +00:00
Douglas Gregor	a0bd17560f	Don't fail on compilers without partial specialization (but don't allow the new syntax either) [SVN r14535]	2002-07-19 19:41:53 +00:00
Douglas Gregor	97f72b7f8b	Don't try to use function types inline for those silly compilers that can't handle it (e.g., Borland C++ 5.5.1) [SVN r14534]	2002-07-19 19:17:14 +00:00
Douglas Gregor	fca8413df6	Support for Borland C++ 5.5.1 [SVN r14533]	2002-07-19 19:16:33 +00:00
Douglas Gregor	fff815d58b	allocator_test.cpp: function_test.cpp: - Test out the new function syntax [SVN r14532]	2002-07-19 18:31:41 +00:00
Douglas Gregor	9e49833a8c	function.hpp: - Support Peter Dimov's rockin' new syntax: function<string (int x, double y, float z)> f; [SVN r14531]	2002-07-19 18:30:48 +00:00
Douglas Gregor	df34714340	Removed 'truth' template, which isn't needed [SVN r14060]	2002-05-29 17:27:59 +00:00
Douglas Gregor	d50e9729ea	Fixed conflicts in 1.28.0 merge [SVN r13946]	2002-05-16 02:18:29 +00:00
Douglas Gregor	e975d1e0c2	Lambda is now a Boost library [SVN r13831]	2002-05-13 12:33:19 +00:00
Douglas Gregor	a3e9eb5db2	Removed tabs [SVN r13812]	2002-05-10 17:54:40 +00:00