This commit was manufactured by cvs2svn to create branch

'python-v2-dev'.

[SVN r14785]

doc/faq.html

@@ -34,14 +34,11 @@ void g() { return f(); }
 <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. 
 
-<h2>Q: How do I assign from a member function?</h2>
-<p> Member function assignments are not included directly in <code>boost::function</code> because they do not conform to the syntax of function objects. Several libraries exist to wrap member functions in a function object and/or bind the first argument to the member function (the <code>this</code> pointer). A few libraries are <a href="tutorial.html#member_func">described</a> in the <a href="../index.html">Boost.Function</a> documentation.
-
     <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: Sat Jul 14 16:00:11 EDT 2001
+Last modified: Wed Nov  7 15:11:52 EST 2001
 <!-- hhmts end -->
   </body>
 </html>

doc/reference.html

@@ -22,19 +22,19 @@
   };
 
   // For <i>N</i> in [0, <i>MAX_ARGS</i>]
-  <b>template</b>&lt;<b>typename</b> ResultType,
+  <b>template</b>&lt;<b>typename</b> Signature,
            <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> Policy    = empty_function_policy, <em>// Deprecated</em>
+	   <b>typename</b> Mixin     = empty_function_mixin, <em>// Deprecated</em>
 	   <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;
-    <b>typedef</b> Policy     policy_type;
-    <b>typedef</b> Mixin      mixin_type;
+    <b>typedef</b> ResultType result_type; <em>// <a href="#novoid">[1]</a></em>
+    <b>typedef</b> Policy     policy_type; <em>// Deprecated</em>
+    <b>typedef</b> Mixin      mixin_type; <em>// Deprecated</em>
     <b>typedef</b> Allocator  allocator_type;
 
     <b>typedef</b> Arg1 argument_type;        <i>// If N == 1</i>
@@ -45,13 +45,15 @@
     <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>(<b>const</b> F<b>&amp;</b>, <b>const</b> Mixin<b>&amp;</b> = Mixin())</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>=(<b>const</b> F<b>&amp;</b>)</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(<b>const</b> F<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>; <em>// Deprecated</em>
+    <a href="#functionN_target_set"><b>template</b>&lt;<b>typename</b> F&gt; <b>void</b> set(F)</a>; <em>// Deprecated</em>
     <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>;
 
@@ -64,46 +66,37 @@
 	   <b>typename</b> Arg2,
            <i>...</i>
 	   <b>typename</b> Arg<i>N</i>,
-           <b>typename</b> Policy,
-           <b>typename</b> Mixin,
+           <b>typename</b> Policy, <em>// Deprecated</em>
+           <b>typename</b> Mixin, <em>// Deprecated</em>
            <b>typename</b> Allocator&gt;
-  <b>void</b> <a href="#swap_functionN">swap</a>(<b>const</b> function<em>N</em>&lt;Arg1, Arg2, <i>...</i>, Arg<i>N</i>, Policy, Mixin, Allocator&gt;<b>&amp;</b>,
-            <b>const</b> function<em>N</em>&lt;Arg1, Arg2, <i>...</i>, Arg<i>N</i>, Policy, Mixin, Allocator&gt;<b>&amp;</b>);
+  <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;Arg1, Arg2, <i>...</i>, Arg<i>N</i>&gt;
+  <b>template</b>&lt;<b>typename</b> Signature, <em>// Function type: ResultType (Arg1, Arg2, ..., Arg<em>N</em>)</em>
+	   <b>typename</b> Policy    = empty_function_policy, <em>// Deprecated</em>
+	   <b>typename</b> Mixin     = empty_function_mixin, <em>// Deprecated</em>
+	   <b>typename</b> Allocator = std::allocator&lt;function_base&gt; &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<i>N</i>(<b>const</b> function<i>N</i><b>&amp;</b>);
-    <b>template</b>&lt;<b>typename</b> F&gt; function<i>N</i>(<b>const</b> F<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<i>N</i><b>&amp;</b> <b>operator</b>=(<b>const</b> function<i>N</i><b>&amp;</b>);
-    <b>template</b>&lt;<b>typename</b> F&gt; function<b>&amp;</b> <b>operator</b>=(<b>const</b> F<b>&amp;</b>);
-    <b>void</b> set(<b>const</b> function<b>&amp;</b>);
-    <b>void</b> set(<b>const</b> function<i>N</i><b>&amp;</b>);
-    <b>template</b>&lt;<b>typename</b> F&gt; <b>void</b> set(<b>const</b> F<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>); <em>// Deprecated</em>
+    <b>void</b> set(<b>const</b> function<i>N</i>&lt;ResultType, Arg1, Arg2, ..., Arg<i>N</i>&gt;<b>&amp;</b>); <em>// Deprecated</em>
+    <b>template</b>&lt;<b>typename</b> F&gt; <b>void</b> set(F); <em>// Deprecated</em>
   };
 
-  <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>(<b>const</b> function&lt;Arg1, Arg2, <i>...</i>, Arg<i>MAX_ARGS</i>&gt;<b>&amp;</b>,
-            <b>const</b> function&lt;Arg1, Arg2, <i>...</i>, Arg<i>MAX_ARGS</i>&gt;<b>&amp;</b>);
+  <b>template</b>&lt;<b>typename</b> Signature, <b>typename</b> Policy, <b>typename</b> Mixin, <b>typename</b> Allocator&gt;
+  <b>void</b> <a href="#swap_function">swap</a>(function&lt;Signature, Policy, Mixin, Allocator&gt;<b>&amp;</b>,
+            function&lt;Signature, Policy, Mixin, Allocator&gt;<b>&amp;</b>);
 }	   
 </pre>
 
@@ -126,22 +119,13 @@
 </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>
-  R <b>operator</b>()(<em>cv-quals</em> X&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>);
-  }
-
-  R <b>operator</b>()(<em>cv-quals</em> X* 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>);
-  }
-  
   <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>
@@ -174,44 +158,64 @@
 <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.</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>(<b>const</b> F<b>&amp;</b> g, <b>const</b> Mixin<b>&amp;</b> = Mixin());</code></a>
+<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>Rationale</b>: <code>g</code> is a reference-to-<code><b>const</b></code> because it is a portable, efficient, and concise way to accept any function object or function pointer. In the case of a function pointer, the type of <code>g</code> is reference-to-<code><b>const</b></code> pointer-to-function.</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>=(<b>const</b> F<b>&amp;</b> g);</code></a>
+<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>Rationale</b>: <code>g</code> is a reference-to-<code><b>const</b></code> because it is a portable, efficient, and concise way to accept any function object or function pointer. In the case of a function pointer, the type of <code>g</code> is reference-to-<code><b>const</b></code> pointer-to-function.</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>
+  <li><b>Note</b>: This function is deprecated and will be removed in future versions of Boost.Function. Please use the assignment operator instead.</li>
 </ul>
 
-<p> <a name="functionN_target_set"><code><b>template</b>&lt;<b>typename</b> F&gt; <b>void</b> set(<b>const</b> F<b>&amp;</b> g);</code></a>
+<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>
+  <li><b>Note</b>: This function is deprecated and will be removed in future versions of Boost.Function. Please use the assignment operator instead.</li>
 </ul>
 
 <p> <a name="functionN_swap"><code><b>void</b> swap(function<i>N</i><b>&amp;</b> g);</code></a>
@@ -237,6 +241,7 @@
       <li><code>policy.postcall(this);</code></li>
     </ol>
   <li><b>Returns</b>: the value returned by <i>target</i>.</li>
+  <li><b>Note</b>: invocation policies have been deprecated and will be removed in a later release.</li>
 </ul>
 
 <h2><a name="function">Class template <code>function</code></a></h2>
@@ -252,11 +257,11 @@
 	 <b>typename</b> Arg2,
          <i>...</i>
 	 <b>typename</b> Arg<i>N</i>,
-         <b>typename</b> Policy,
-         <b>typename</b> Mixin,
+         <b>typename</b> Policy, <em>// Deprecated</em>
+         <b>typename</b> Mixin, <em>// Deprecated</em>
          <b>typename</b> Allocator&gt;
-<b>void</b> <a name="swap_functionN">swap</a>(<b>const</b> function<i>N</i>&lt;Arg1, Arg2, <i>...</i>, Arg<i>N</i>, Policy, Mixin, Allocator&gt;<b>&amp;</b> f,
-          <b>const</b> function<i>N</i>&lt;Arg1, Arg2, <i>...</i>, Arg<i>N</i>, Policy, Mixin, Allocator&gt;<b>&amp;</b> g);
+<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>
@@ -264,23 +269,21 @@
 
 <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>(<b>const</b> function&lt;Arg1, Arg2, <i>...</i>, Arg<i>MAX_ARGS</i>&gt;<b>&amp;</b> f,
-          <b>const</b> function&lt;Arg1, Arg2, <i>...</i>, Arg<i>MAX_ARGS</i>&gt;<b>&amp;</b> g);
+<b>template</b>&lt;<b>typename</b> Signature, <b>typename</b> Policy, <b>typename</b> Mixin, <b>typename</b> Allocator&gt;
+<b>void</b> <a name="swap_function">swap</a>(function&lt;Signature, Policy, Mixin, Allocator&gt;<b>&amp;</b> f,
+          function&lt;Signature, 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>
 
     <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: Sun Oct 28 00:40:55 EDT 2001
+Last modified: Fri Jul 19 16:40:00 EDT 2002
 <!-- hhmts end -->
   </body>
 </html>

doc/tutorial.html

@@ -8,14 +8,58 @@
 
     <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> Boost.Function has two syntactical forms: the preferred form and the compatibility form. The preferred form fits more closely with the C++ language and reduces the number of separate template parameters that need to be considered, often improving readability; however, the preferred form is not supported on all platforms due to compiler bugs. The compatible form will work on all compilers supported by Boost.Function. Consult the table below to determine which syntactic form to use for your compiler.
+
+    <center>
+      <table border=1 cellspacing=1>
+          <tr><th bgcolor="#008080">Preferred Syntax</th><th bgcolor="#008080">Compatible Syntax</th></tr>
+          <tr>
+            <td>
+              <ul>
+                <li>GNU C++ 2.95.x, 3.0.x, 3.1.x</li>
+                <li>Comeau C++ 4.2.45.2</li>
+                <li>SGI MIPSpro 7.3.0</li>
+                <li>Intel C++ 5.0, 6.0</li>
+                <li>Compaq's cxx 6.2</li>
+              </ul>
+            </td>
+            <td>
+              <ul>
+                <li>Microsoft Visual C++ 6.0, 7.0</li>
+                <li>Borland C++ 5.5.1</li>
+                <li>Sun WorkShop 6 update 2 C++ 5.3</li>
+                <li>Metrowerks CodeWarrior 8.1</li>
+              </ul>
+            </td>
+          </tr>
+      </table>
+      </center>
+
+<p> If your compiler does not appear in this list, please try the preferred syntax and report your results to the Boost list so that we can keep this table up-to-date.
+
+<a name="preferred"><h2>Basic Usage</h2></a>
+<p> A function wrapper is defined simply by instantiating the <code>function</code> class template with the desired return type and argument types, formulated as a C++ function type. 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>:
+<center>
+<table border=1 cellspacing=1>
+        <tr><th bgcolor="#008080">Preferred Syntax</th><th bgcolor="#008080">Compatible Syntax</th></tr>
+        <tr>
+          <td>
+            <pre>
+boost::<a href="reference.html#function">function</a>&lt;float (int x, int y)&gt; f;
+            </pre>
+          </td>
+          <td>
+            <pre>
+boost::<a href="reference.html#functionN">function2</a>&lt;float, int, int&gt; f;
+            </pre>
+          </td>
+        </tr>
+</table>
+</center>
 
 <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; }; 
@@ -27,31 +71,47 @@ f = int_div();
 <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;
+std::cout &lt;&lt; f(5, 3) &gt;&gt; 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;
+<center>
+<table border=1 cellspacing=1>
+        <tr><th bgcolor="#008080">Preferred Syntax</th><th bgcolor="#008080">Compatible Syntax</th></tr>
+          <tr>
+            <td>
+              <pre>
+boost::function&lt;void (int values[], int n, int&amp; sum, float&amp; avg)&gt; sum_avg;
+              </pre>
+            </td>
+            <td>
+              <pre>
+boost::function4&lt;void, int[], int, int&amp;, float&gt; sum_avg;
+              </pre>
+            </td>
+          </tr>
+</table>
+</center>
 
+<pre>
 void do_sum_avg(int values[], int n, int& sum, float&amp; avg)
 {
   sum = 0;
-  for (int i = 0; i < n; i++)
+  for (int i = 0; i &lt; n; i++)
     sum += values[i];
   avg = (float)sum / n;
 }
 
-sum_avg = &do_sum_avg;
+sum_avg = &amp;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;
+  std::cout &lt;&lt; f(5, 3) &lt;&lt; std::endl;
 else
-  std::cout << "f has no target, so it is unsafe to call" << std::endl;
+  std::cout &lt;&lt; "f has no target, so it is unsafe to call" &lt;&lt; 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.
@@ -60,120 +120,139 @@ else
 <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 = &mul_ints;
+  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 = &X::foo;
+<center>
+<table border=1 cellspacing=1>
+        <tr><th bgcolor="#008080">Preferred Syntax</th><th bgcolor="#008080">Compatible Syntax</th></tr>
+          <tr>
+            <td>
+<pre>
+struct X {
+  int foo(int);
+};
+
+boost::function&lt;int (X*, int)&gt; f;
+
+f = &amp;X::foo;
   
-  X x;
-  f(&x, 5);
+X x;
+f(&amp;x, 5);
 </pre>
+            </td>
+            <td>
+<pre>
+struct X {
+  int foo(int);
+};
+
+boost::function2&lt;int, X*, int&gt; f;
+
+f = &amp;X::foo;
+  
+X x;
+f(&amp;x, 5);
+</pre>
+            </td>
+          </tr>
+</table>
+</center>
+
 <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:
+<center>
+<table border=1 cellspacing=1>
+        <tr><th bgcolor="#008080">Preferred Syntax</th><th bgcolor="#008080">Compatible Syntax</th></tr>
+          <tr>
+            <td>
 <pre>
   struct X {
     int foo(int);
   };
 
-  boost::function&lt;int, int&gt; f;
+  boost::function&lt;int (int)&gt; f;
   X x;
-  f = std::bind1st(std::mem_fun(&X::foo), &x);
+  f = std::bind1st(std::mem_fun(&amp;X::foo), &amp;x);
 
-  f(5); // Call x.foo(5)</pre></li>
+  f(5); // Call x.foo(5)</pre>
+            </td>
+            <td>
+<pre>
+  struct X {
+    int foo(int);
+  };
 
-  <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>
+  boost::function1&lt;int, int&gt; f;
+  X x;
+  f = std::bind1st(std::mem_fun(&amp;X::foo), &amp;x);
+
+  f(5); // Call x.foo(5)</pre>
+            </td>
+          </tr>
+</table>
+</center>
+</li>
+
+  <li><a href="../../lambda/doc/index.html">The Boost.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. </li>
 </ul>
 
-<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:
+<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:
+<center>
+<table border=1 cellspacing=1>
+        <tr><th bgcolor="#008080">Preferred Syntax</th><th bgcolor="#008080">Compatible Syntax</th></tr>
+          <tr>
+            <td>
 <pre>
-boost::function2&lt;float, int, int&gt; f;
+  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>
-
-<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:
+            </td>
+            <td>
 <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;
+  stateful_type a_function_object;
+  boost::function1&lt;int, int&gt; f;
+  f = ref(a_function_object);
+
+  boost::function1&lt;int, int&gt; f2(f);
 </pre>
+            </td>
+          </tr>
+</table>
+</center>
 
+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.
+ 
     <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: Sun Oct 28 00:49:02 EDT 2001
+Last modified: Mon Aug  5 11:07:17 EDT 2002
 <!-- hhmts end -->
   </body>
 </html>

example/sum_avg.cpp

@@ -27,7 +27,9 @@ void do_sum_avg(int values[], int n, int& sum, float& avg)
 int
 main()
 {
-  boost::function<void, int[], int, int&, float&> sum_avg;
+  // The second parameter should be int[], but some compilers (e.g., GCC)
+  // complain about this 
+  boost::function<void, int*, int, int&, float&> sum_avg;
 
   sum_avg = &do_sum_avg;
 

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.
@@ -20,6 +20,10 @@
 #define BOOST_FUNCTION_HPP
 
 #include <boost/function/function_base.hpp>
+#include <boost/type_traits/function_traits.hpp>
+#include <boost/type_traits/same_traits.hpp>
+#include <boost/type_traits/transform_traits.hpp>
+#include <boost/type_traits/ice.hpp>
 #include <boost/function/function0.hpp>
 #include <boost/function/function1.hpp>
 #include <boost/function/function2.hpp>
@@ -32,6 +36,11 @@
 #include <boost/function/function9.hpp>
 #include <boost/function/function10.hpp>
 
+// Don't compile any of this code if we've asked not to include the deprecated
+// syntax and we don't have partial specialization, because none of this code
+// can work.
+#if !defined (BOOST_FUNCTION_NO_DEPRECATED) || !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+
 namespace boost {
   namespace detail {
     namespace function {
@@ -53,13 +62,19 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
-          typedef function0<R, Policy, Mixin, Allocator> type;
+          typedef function0<R, 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                            Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                            Allocator> type;
         };
       };
 
@@ -78,13 +93,19 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
-          typedef function1<R, T1, Policy, Mixin, Allocator> type;
+          typedef function1<R, T1, 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                            Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                            Allocator> type;
         };
       };
 
@@ -103,13 +124,19 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
-          typedef function2<R, T1, T2, Policy, Mixin, Allocator> type;
+          typedef function2<R, T1, T2, 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                            Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                            Allocator> type;
         };
       };
 
@@ -128,13 +155,19 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
-          typedef function3<R, T1, T2, T3, Policy, Mixin, Allocator> type;
+          typedef function3<R, T1, T2, T3, 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                            Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                            Allocator> type;
         };
       };
 
@@ -153,13 +186,19 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
-          typedef function4<R, T1, T2, T3, T4, Policy, Mixin, Allocator> type;
+          typedef function4<R, T1, T2, T3, T4, 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                            Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                            Allocator> type;
         };
       };
 
@@ -178,13 +217,19 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
-          typedef function5<R, T1, T2, T3, T4, T5, Policy, Mixin, Allocator> 
+          typedef function5<R, T1, T2, T3, T4, T5, 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                            Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                            Allocator> 
           type;
         };
       };
@@ -204,13 +249,19 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
-          typedef function6<R, T1, T2, T3, T4, T5, T6, Policy, Mixin, Allocator>
+          typedef function6<R, T1, T2, T3, T4, T5, T6, 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                            Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                            Allocator>
           type;
         };
       };
@@ -230,13 +281,18 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
-          typedef function7<R, T1, T2, T3, T4, T5, T6, T7, Policy, Mixin, 
+          typedef function7<R, T1, T2, T3, T4, T5, T6, T7, 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                            Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
                             Allocator> type;
         };
       };
@@ -256,13 +312,18 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
-          typedef function8<R, T1, T2, T3, T4, T5, T6, T7, T8, Policy, Mixin, 
+          typedef function8<R, T1, T2, T3, T4, T5, T6, T7, T8, 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                            Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
                             Allocator> type;
         };
       };
@@ -282,14 +343,19 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
-          typedef function9<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, Policy, 
-                            Mixin, Allocator> type;
+          typedef function9<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                            Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                            Allocator> type;
         };
       };
 
@@ -308,65 +374,366 @@ namespace boost {
           typename T8,
           typename T9,
           typename T10,
-          typename Policy = empty_function_policy,
-          typename Mixin = empty_function_mixin,
-          typename Allocator = std::allocator<function_base>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Policy,
+          typename Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+          typename Allocator
         >
         struct params
         {
           typedef function10<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, 
-                             Policy, Mixin, Allocator> type;
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                             Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                             Allocator> type;
         };
       };
 
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+      template<bool GetIt, typename Traits> 
+      struct get_arg1_type
+      {
+        typedef unusable type;
+      };
+
+      template<typename Traits> 
+      struct get_arg1_type<true, Traits>
+      {
+        typedef typename Traits::arg1_type type;
+      };
+
+      template<bool GetIt, typename Traits> 
+      struct get_arg2_type
+      {
+        typedef unusable type;
+      };
+
+      template<typename Traits> 
+      struct get_arg2_type<true, Traits>
+      {
+        typedef typename Traits::arg2_type type;
+      };
+
+      template<bool GetIt, typename Traits> 
+      struct get_arg3_type
+      {
+        typedef unusable type;
+      };
+
+      template<typename Traits> 
+      struct get_arg3_type<true, Traits>
+      {
+        typedef typename Traits::arg3_type type;
+      };
+
+      template<bool GetIt, typename Traits> 
+      struct get_arg4_type
+      {
+        typedef unusable type;
+      };
+
+      template<typename Traits> 
+      struct get_arg4_type<true, Traits>
+      {
+        typedef typename Traits::arg4_type type;
+      };
+
+      template<bool GetIt, typename Traits> 
+      struct get_arg5_type
+      {
+        typedef unusable type;
+      };
+
+      template<typename Traits> 
+      struct get_arg5_type<true, Traits>
+      {
+        typedef typename Traits::arg5_type type;
+      };
+
+      template<bool GetIt, typename Traits> 
+      struct get_arg6_type
+      {
+        typedef unusable type;
+      };
+
+      template<typename Traits> 
+      struct get_arg6_type<true, Traits>
+      {
+        typedef typename Traits::arg6_type type;
+      };
+
+      template<bool GetIt, typename Traits> 
+      struct get_arg7_type
+      {
+        typedef unusable type;
+      };
+
+      template<typename Traits> 
+      struct get_arg7_type<true, Traits>
+      {
+        typedef typename Traits::arg7_type type;
+      };
+
+      template<bool GetIt, typename Traits> 
+      struct get_arg8_type
+      {
+        typedef unusable type;
+      };
+
+      template<typename Traits> 
+      struct get_arg8_type<true, Traits>
+      {
+        typedef typename Traits::arg8_type type;
+      };
+
+      template<bool GetIt, typename Traits> 
+      struct get_arg9_type
+      {
+        typedef unusable type;
+      };
+
+      template<typename Traits> 
+      struct get_arg9_type<true, Traits>
+      {
+        typedef typename Traits::arg9_type type;
+      };
+
+      template<bool GetIt, typename Traits> 
+      struct get_arg10_type
+      {
+        typedef unusable type;
+      };
+
+      template<typename Traits> 
+      struct get_arg10_type<true, Traits>
+      {
+        typedef typename Traits::arg10_type type;
+      };
+
+      template<int X, int Y> 
+      struct gte
+      {
+        BOOST_STATIC_CONSTANT(bool, value = (X >= Y));
+      };
+
+      template<bool IsFunction,
+               typename InR, 
+               typename InT1, 
+               typename InT2, 
+               typename InT3, 
+               typename InT4,
+               typename InT5, 
+               typename InT6, 
+               typename InT7, 
+               typename InT8, 
+               typename InT9,
+               typename InT10,
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+               typename InPolicy,
+               typename InMixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+               typename InAllocator>
+      struct maybe_decode_function_args
+      {
+        typedef function_traits<InR> traits;
+
+        typedef typename traits::result_type R;
+        typedef typename get_arg1_type<(gte<(traits::arity), 1>::value), 
+                                       traits>::type T1;
+        typedef typename get_arg2_type<(gte<(traits::arity), 2>::value), 
+                                       traits>::type T2;
+        typedef typename get_arg3_type<(gte<(traits::arity), 3>::value), 
+                                       traits>::type T3;
+        typedef typename get_arg4_type<(gte<(traits::arity), 4>::value), 
+                                       traits>::type T4;
+        typedef typename get_arg5_type<(gte<(traits::arity), 5>::value), 
+                                       traits>::type T5;
+        typedef typename get_arg6_type<(gte<(traits::arity), 6>::value), 
+                                       traits>::type T6;
+        typedef typename get_arg7_type<(gte<(traits::arity), 7>::value), 
+                                       traits>::type T7;
+        typedef typename get_arg8_type<(gte<(traits::arity), 8>::value), 
+                                       traits>::type T8;
+        typedef typename get_arg9_type<(gte<(traits::arity), 9>::value), 
+                                       traits>::type T9;
+        typedef typename get_arg10_type<(gte<(traits::arity), 10>::value), 
+                                        traits>::type T10;
+
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+        typedef typename ct_if<(is_same<InT1, unusable>::value),
+                               empty_function_policy,
+                               InT1>::type Policy;
+        typedef typename ct_if<(is_same<InT2, unusable>::value),
+                               empty_function_mixin,
+                               InT2>::type Mixin;
+        typedef typename ct_if<(is_same<InT3, unusable>::value),
+                               std::allocator<function_base>,
+                               InT3>::type Allocator;
+#else
+        typedef typename ct_if<(is_same<InT1, unusable>::value),
+                               std::allocator<function_base>,
+                               InT1>::type Allocator;
+#endif // BOOST_FUNCTION_NO_DEPRECATED
+      };
+
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+      template<typename InR, 
+               typename InT1, 
+               typename InT2, 
+               typename InT3, 
+               typename InT4,
+               typename InT5, 
+               typename InT6, 
+               typename InT7, 
+               typename InT8, 
+               typename InT9,
+               typename InT10,
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+               typename InPolicy,
+               typename InMixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+               typename InAllocator>
+      struct maybe_decode_function_args<false, InR, InT1, InT2, InT3, InT4,
+                                        InT5, InT6, InT7, InT8, InT9, InT10,
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                                        InPolicy, InMixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED 
+                                        InAllocator>
+      {
+        // Not a function, so just map the types directly
+        typedef InR R;
+        typedef InT1 T1;
+        typedef InT2 T2;
+        typedef InT3 T3;
+        typedef InT4 T4;
+        typedef InT5 T5;
+        typedef InT6 T6;
+        typedef InT7 T7;
+        typedef InT8 T8;
+        typedef InT9 T9;
+        typedef InT10 T10;
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+        typedef InPolicy Policy;
+        typedef InMixin Mixin;
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+        typedef InAllocator Allocator;
+
+      };
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+
+#endif // ndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
       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> 
+        typename InR, 
+        typename InT1, 
+        typename InT2, 
+        typename InT3, 
+        typename InT4,
+        typename InT5, 
+        typename InT6, 
+        typename InT7, 
+        typename InT8, 
+        typename InT9,
+        typename InT10,
+        typename InPolicy = empty_function_policy,
+        typename InMixin = empty_function_mixin,
+        typename InAllocator = std::allocator<function_base> 
       >
       struct get_function_impl
       {
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+        typedef maybe_decode_function_args<(is_function<InR>::value),
+                                           InR, InT1, InT2, InT3, InT4, InT5,
+                                           InT6, InT7, InT8, InT9, InT10,
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                                           InPolicy, InMixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                                           InAllocator> decoder;
+        typedef typename decoder::R R;
+        typedef typename decoder::T1 T1;
+        typedef typename decoder::T2 T2;
+        typedef typename decoder::T3 T3;
+        typedef typename decoder::T4 T4;
+        typedef typename decoder::T5 T5;
+        typedef typename decoder::T6 T6;
+        typedef typename decoder::T7 T7;
+        typedef typename decoder::T8 T8;
+        typedef typename decoder::T9 T9;
+        typedef typename decoder::T10 T10;
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+        typedef typename decoder::Policy Policy;
+        typedef typename decoder::Mixin Mixin;
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+        typedef typename decoder::Allocator Allocator;
+#else
+        typedef InR R;
+        typedef InT1 T1;
+        typedef InT2 T2;
+        typedef InT3 T3;
+        typedef InT4 T4;
+        typedef InT5 T5;
+        typedef InT6 T6;
+        typedef InT7 T7;
+        typedef InT8 T8;
+        typedef InT9 T9;
+        typedef InT10 T10;
+        typedef InPolicy Policy;
+        typedef InMixin Mixin;
+        typedef InAllocator Allocator;
+#endif // def BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
         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
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                             Policy, Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                             Allocator>::type
         type;
       };
 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
   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> 
+    typename InR, 
+    typename InT1, 
+    typename InT2, 
+    typename InT3, 
+    typename InT4,
+    typename InT5, 
+    typename InT6, 
+    typename InT7, 
+    typename InT8, 
+    typename InT9,
+    typename InT10,
+    typename InMyPolicy = empty_function_policy,
+    typename InMyMixin = empty_function_mixin,
+    typename InMyAllocator = std::allocator<function_base> 
   >
-  struct function_traits_builder
+  class 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 get_function_impl<InR, InT1, InT2, InT3, InT4, InT5, InT6, InT7, 
+                              InT8, InT9, InT10, InMyPolicy, InMyMixin, 
+                              InMyAllocator>
+      impl;
 
+    typedef typename impl::R MyR;
+    typedef typename impl::T1 MyT1;
+    typedef typename impl::T2 MyT2;
+    typedef typename impl::T3 MyT3;
+    typedef typename impl::T4 MyT4;
+    typedef typename impl::T5 MyT5;
+    typedef typename impl::T6 MyT6;
+    typedef typename impl::T7 MyT7;
+    typedef typename impl::T8 MyT8;
+    typedef typename impl::T9 MyT9;
+    typedef typename impl::T10 MyT10;
+    typedef typename impl::Policy MyPolicy;
+    typedef typename impl::Mixin MyMixin;
+    typedef typename impl::Allocator MyAllocator;
+
+  public:
+    typedef typename impl::type type;
     typedef MyPolicy    policy_type;
     typedef MyMixin     mixin_type;
     typedef MyAllocator allocator_type;
@@ -374,28 +741,28 @@ namespace boost {
 #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> {};
+        public function_traits_builder<MyR, MyT1, MyT2, MyT3, MyT4, MyT5, MyT6,
+                                       MyT7, MyT8, MyT9, MyT10, 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> {};
+        public function_traits_builder<MyR, MyT1, MyT2, MyT3, MyT4, MyT5, MyT6,
+                                       MyT7, MyT8, MyT9, MyT10, 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> {};
+        public function_traits_builder<MyR, MyT1, MyT2, MyT3, MyT4, MyT5, MyT6,
+                                       MyT7, MyT8, MyT9, MyT10, policy_type, 
+                                       mixin_type, Allocator> {};
 #else
     template<typename Policy>
     struct policy 
     {
-      typedef typename function_traits_builder<R, T1, T2, T3, T4, T5, T6, T7,
-                                               T8, T9, T10, Policy, 
-                                               mixin_type, 
+      typedef typename function_traits_builder<MyR, MyT1, MyT2, MyT3, MyT4, 
+                                               MyT5, MyT6, MyT7, MyT8, MyT9, 
+                                               MyT10, Policy, mixin_type, 
                                                allocator_type>::type
         type;
     };
@@ -403,8 +770,9 @@ namespace boost {
     template<typename Mixin>
     struct mixin
     {
-      typedef typename function_traits_builder<R, T1, T2, T3, T4, T5, T6, T7,
-                                               T8, T9, T10, policy_type, Mixin,
+      typedef typename function_traits_builder<MyR, MyT1, MyT2, MyT3, MyT4, 
+                                               MyT5, MyT6, MyT7, MyT8, MyT9, 
+                                               MyT10, policy_type, Mixin,
                                                allocator_type>::type
         type;
     };
@@ -412,14 +780,15 @@ namespace boost {
     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
+      typedef typename function_traits_builder<MyR, MyT1, MyT2, MyT3, MyT4, 
+                                               MyT5, MyT6, MyT7, MyT8, MyT9, 
+                                               MyT10, policy_type, mixin_type,
+                                               Allocator>::type
         type;
     };
-#endif
+#endif // ndef NO_DEPENDENT_NESTED_DERIVATIONS
   };
-
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
     } // end namespace function
   } // end namespace detail
 
@@ -438,9 +807,11 @@ namespace boost {
   >
   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>
+                                               T8, T9, T10>::type
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+    , public detail::function::function_traits_builder<R, T1, T2, T3, T4, T5, 
+                                                       T6, T7, T8, T9, T10>
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
   {
     typedef typename detail::function::get_function_impl<R, T1, T2, T3, T4, T5,
                                                          T6, T7, T8, T9, T10
@@ -448,74 +819,62 @@ namespace boost {
       base_type;
 
   public:
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
     typedef typename base_type::policy_type policy_type;
     typedef typename base_type::mixin_type mixin_type;
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
     typedef typename base_type::allocator_type allocator_type;              
     typedef function self_type;                                     
                                                                             
     function() : base_type() {}                                     
                                                                             
     template<typename Functor>                                              
-    function(const Functor& f) : base_type(f) {}
+    function(Functor BOOST_FUNCTION_TARGET_FIX(const &) f) : base_type(f) {}
                       
-#ifdef __BORLANDC__
-    template<typename Functor>
-    function(Functor* f) : base_type(f) {}
-#endif // __BORLANDC__
-                                                      
     function(const self_type& f) : base_type(static_cast<const base_type&>(f)){}
          
     template<typename Functor>
-    function& operator=(const Functor& f)
+    self_type& operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
     {
       self_type(f).swap(*this);
       return *this;
     }
 
-#ifdef __BORLANDC__
-    template<typename Functor>
-    self_type& operator=(Functor* f)
-    {
-      self_type(f).swap(*this);
-      return *this;
-    }
-#endif // __BORLANDC__
-
     self_type& operator=(const base_type& f)
     {
       self_type(f).swap(*this);
       return *this;
     }
 
-    self_type& operator=(const self_type& f)                                  
+    self_type& operator=(const self_type& f)
     {   
       self_type(f).swap(*this);
-      return *this;                                                         
-    }                                                           
+      return *this;
+    }
 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
     template<typename Functor>
-    void set(const Functor& f)
+    BOOST_FUNCTION_DEPRECATED_PRE 
+        void set(Functor BOOST_FUNCTION_TARGET_FIX(const &) f) 
     {
+      BOOST_FUNCTION_DEPRECATED_INNER
       self_type(f).swap(*this);
     }
 
-#ifdef __BORLANDC__
-    template<typename Functor>
-    void set(Functor* f)
-    {
-      self_type(f).swap(*this);
-    }
-#endif // __BORLANDC__
- 
-    void set(const base_type& f)
+    BOOST_FUNCTION_DEPRECATED_PRE
+    void set(const base_type& f) 
     {
+      BOOST_FUNCTION_DEPRECATED_INNER
       self_type(f).swap(*this);
     }
 
+    BOOST_FUNCTION_DEPRECATED_PRE
     void set(const self_type& f)                             
     {
+      BOOST_FUNCTION_DEPRECATED_INNER
       self_type(f).swap(*this);
     }   
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
   };
 
   template<typename R,
@@ -534,6 +893,8 @@ namespace boost {
   {
     f1.swap(f2);
   }
-}
+} // end namespace boost
+
+#endif // !no deprecated || !no partial specialization
 
 #endif

include/boost/function/function0.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION0_HPP
-#define BOOST_FUNCTION0_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION0_HEADER
+#define BOOST_FUNCTION_FUNCTION0_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 0
-#define BOOST_FUNCTION_COMMA 
 #define BOOST_FUNCTION_TEMPLATE_PARMS 
 #define BOOST_FUNCTION_TEMPLATE_ARGS 
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS 
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS 
 #define BOOST_FUNCTION_PARMS 
 #define BOOST_FUNCTION_ARGS 
-#define BOOST_FUNCTION_FUNCTION function0
-#define BOOST_FUNCTION_BASE function0_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base0
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker0
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker0
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker0
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker0
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker0
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker0
+#define BOOST_FUNCTION_NOT_0_PARMS 
+#define BOOST_FUNCTION_NOT_0_ARGS 
 
 #include <boost/function/function_template.hpp>
 
-#undef BOOST_FUNCTION_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION0_HPP
+#endif // BOOST_FUNCTION_FUNCTION0_HEADER

include/boost/function/function1.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION1_HPP
-#define BOOST_FUNCTION1_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION1_HEADER
+#define BOOST_FUNCTION_FUNCTION1_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 1
-#define BOOST_FUNCTION_COMMA ,
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T1
-#define BOOST_FUNCTION_TEMPLATE_ARGS T1
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS typename OtherT1
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS OtherT1
-#define BOOST_FUNCTION_PARMS T1 a1
-#define BOOST_FUNCTION_ARGS a1
-#define BOOST_FUNCTION_FUNCTION function1
-#define BOOST_FUNCTION_BASE function1_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base1
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker1
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker1
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker1
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker1
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker1
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker1
+#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0
+#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_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION1_HPP
+#endif // BOOST_FUNCTION_FUNCTION1_HEADER

include/boost/function/function10.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION10_HPP
-#define BOOST_FUNCTION10_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION10_HEADER
+#define BOOST_FUNCTION_FUNCTION10_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 10
-#define BOOST_FUNCTION_COMMA ,
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10
-#define BOOST_FUNCTION_TEMPLATE_ARGS T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS typename OtherT1, typename OtherT2, typename OtherT3, typename OtherT4, typename OtherT5, typename OtherT6, typename OtherT7, typename OtherT8, typename OtherT9, typename OtherT10
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS OtherT1, OtherT2, OtherT3, OtherT4, OtherT5, OtherT6, OtherT7, OtherT8, OtherT9, OtherT10
-#define BOOST_FUNCTION_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8, T9 a9, T10 a10
-#define BOOST_FUNCTION_ARGS a1, a2, a3, a4, a5, a6, a7, a8, a9, a10
-#define BOOST_FUNCTION_FUNCTION function10
-#define BOOST_FUNCTION_BASE function10_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base10
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker10
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker10
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker10
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker10
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker10
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker10
+#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
+#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_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION10_HPP
+#endif // BOOST_FUNCTION_FUNCTION10_HEADER

include/boost/function/function2.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION2_HPP
-#define BOOST_FUNCTION2_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION2_HEADER
+#define BOOST_FUNCTION_FUNCTION2_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 2
-#define BOOST_FUNCTION_COMMA ,
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T1, typename T2
-#define BOOST_FUNCTION_TEMPLATE_ARGS T1, T2
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS typename OtherT1, typename OtherT2
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS OtherT1, OtherT2
-#define BOOST_FUNCTION_PARMS T1 a1, T2 a2
-#define BOOST_FUNCTION_ARGS a1, a2
-#define BOOST_FUNCTION_FUNCTION function2
-#define BOOST_FUNCTION_BASE function2_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base2
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker2
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker2
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker2
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker2
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker2
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker2
+#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1
+#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_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION2_HPP
+#endif // BOOST_FUNCTION_FUNCTION2_HEADER

include/boost/function/function3.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION3_HPP
-#define BOOST_FUNCTION3_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION3_HEADER
+#define BOOST_FUNCTION_FUNCTION3_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 3
-#define BOOST_FUNCTION_COMMA ,
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T1, typename T2, typename T3
-#define BOOST_FUNCTION_TEMPLATE_ARGS T1, T2, T3
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS typename OtherT1, typename OtherT2, typename OtherT3
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS OtherT1, OtherT2, OtherT3
-#define BOOST_FUNCTION_PARMS T1 a1, T2 a2, T3 a3
-#define BOOST_FUNCTION_ARGS a1, a2, a3
-#define BOOST_FUNCTION_FUNCTION function3
-#define BOOST_FUNCTION_BASE function3_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base3
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker3
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker3
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker3
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker3
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker3
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker3
+#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2
+#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_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION3_HPP
+#endif // BOOST_FUNCTION_FUNCTION3_HEADER

include/boost/function/function4.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION4_HPP
-#define BOOST_FUNCTION4_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION4_HEADER
+#define BOOST_FUNCTION_FUNCTION4_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 4
-#define BOOST_FUNCTION_COMMA ,
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T1, typename T2, typename T3, typename T4
-#define BOOST_FUNCTION_TEMPLATE_ARGS T1, T2, T3, T4
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS typename OtherT1, typename OtherT2, typename OtherT3, typename OtherT4
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS OtherT1, OtherT2, OtherT3, OtherT4
-#define BOOST_FUNCTION_PARMS T1 a1, T2 a2, T3 a3, T4 a4
-#define BOOST_FUNCTION_ARGS a1, a2, a3, a4
-#define BOOST_FUNCTION_FUNCTION function4
-#define BOOST_FUNCTION_BASE function4_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base4
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker4
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker4
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker4
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker4
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker4
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker4
+#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3
+#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_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION4_HPP
+#endif // BOOST_FUNCTION_FUNCTION4_HEADER

include/boost/function/function5.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION5_HPP
-#define BOOST_FUNCTION5_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION5_HEADER
+#define BOOST_FUNCTION_FUNCTION5_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 5
-#define BOOST_FUNCTION_COMMA ,
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T1, typename T2, typename T3, typename T4, typename T5
-#define BOOST_FUNCTION_TEMPLATE_ARGS T1, T2, T3, T4, T5
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS typename OtherT1, typename OtherT2, typename OtherT3, typename OtherT4, typename OtherT5
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS OtherT1, OtherT2, OtherT3, OtherT4, OtherT5
-#define BOOST_FUNCTION_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5
-#define BOOST_FUNCTION_ARGS a1, a2, a3, a4, a5
-#define BOOST_FUNCTION_FUNCTION function5
-#define BOOST_FUNCTION_BASE function5_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base5
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker5
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker5
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker5
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker5
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker5
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker5
+#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4
+#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_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION5_HPP
+#endif // BOOST_FUNCTION_FUNCTION5_HEADER

include/boost/function/function6.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION6_HPP
-#define BOOST_FUNCTION6_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION6_HEADER
+#define BOOST_FUNCTION_FUNCTION6_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 6
-#define BOOST_FUNCTION_COMMA ,
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T1, typename T2, typename T3, typename T4, typename T5, typename T6
-#define BOOST_FUNCTION_TEMPLATE_ARGS T1, T2, T3, T4, T5, T6
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS typename OtherT1, typename OtherT2, typename OtherT3, typename OtherT4, typename OtherT5, typename OtherT6
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS OtherT1, OtherT2, OtherT3, OtherT4, OtherT5, OtherT6
-#define BOOST_FUNCTION_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6
-#define BOOST_FUNCTION_ARGS a1, a2, a3, a4, a5, a6
-#define BOOST_FUNCTION_FUNCTION function6
-#define BOOST_FUNCTION_BASE function6_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base6
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker6
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker6
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker6
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker6
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker6
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker6
+#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5
+#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_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION6_HPP
+#endif // BOOST_FUNCTION_FUNCTION6_HEADER

include/boost/function/function7.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION7_HPP
-#define BOOST_FUNCTION7_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION7_HEADER
+#define BOOST_FUNCTION_FUNCTION7_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 7
-#define BOOST_FUNCTION_COMMA ,
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7
-#define BOOST_FUNCTION_TEMPLATE_ARGS T1, T2, T3, T4, T5, T6, T7
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS typename OtherT1, typename OtherT2, typename OtherT3, typename OtherT4, typename OtherT5, typename OtherT6, typename OtherT7
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS OtherT1, OtherT2, OtherT3, OtherT4, OtherT5, OtherT6, OtherT7
-#define BOOST_FUNCTION_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7
-#define BOOST_FUNCTION_ARGS a1, a2, a3, a4, a5, a6, a7
-#define BOOST_FUNCTION_FUNCTION function7
-#define BOOST_FUNCTION_BASE function7_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base7
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker7
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker7
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker7
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker7
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker7
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker7
+#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6
+#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_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION7_HPP
+#endif // BOOST_FUNCTION_FUNCTION7_HEADER

include/boost/function/function8.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION8_HPP
-#define BOOST_FUNCTION8_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION8_HEADER
+#define BOOST_FUNCTION_FUNCTION8_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 8
-#define BOOST_FUNCTION_COMMA ,
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8
-#define BOOST_FUNCTION_TEMPLATE_ARGS T1, T2, T3, T4, T5, T6, T7, T8
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS typename OtherT1, typename OtherT2, typename OtherT3, typename OtherT4, typename OtherT5, typename OtherT6, typename OtherT7, typename OtherT8
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS OtherT1, OtherT2, OtherT3, OtherT4, OtherT5, OtherT6, OtherT7, OtherT8
-#define BOOST_FUNCTION_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8
-#define BOOST_FUNCTION_ARGS a1, a2, a3, a4, a5, a6, a7, a8
-#define BOOST_FUNCTION_FUNCTION function8
-#define BOOST_FUNCTION_BASE function8_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base8
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker8
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker8
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker8
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker8
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker8
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker8
+#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7
+#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_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION8_HPP
+#endif // BOOST_FUNCTION_FUNCTION8_HEADER

include/boost/function/function9.hpp

@@ -1,5 +1,5 @@
 // Boost.Function library
-
+//
 // Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
 //
 // Permission to copy, use, sell and distribute this software is granted
@@ -10,50 +10,28 @@
 //
 // 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_FUNCTION9_HPP
-#define BOOST_FUNCTION9_HPP
-
-#include <boost/function/function_base.hpp>
+#ifndef BOOST_FUNCTION_FUNCTION9_HEADER
+#define BOOST_FUNCTION_FUNCTION9_HEADER
 
 #define BOOST_FUNCTION_NUM_ARGS 9
-#define BOOST_FUNCTION_COMMA ,
-#define BOOST_FUNCTION_TEMPLATE_PARMS typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9
-#define BOOST_FUNCTION_TEMPLATE_ARGS T1, T2, T3, T4, T5, T6, T7, T8, T9
-#define BOOST_FUNCTION_OTHER_TEMPLATE_PARMS typename OtherT1, typename OtherT2, typename OtherT3, typename OtherT4, typename OtherT5, typename OtherT6, typename OtherT7, typename OtherT8, typename OtherT9
-#define BOOST_FUNCTION_OTHER_TEMPLATE_ARGS OtherT1, OtherT2, OtherT3, OtherT4, OtherT5, OtherT6, OtherT7, OtherT8, OtherT9
-#define BOOST_FUNCTION_PARMS T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8, T9 a9
-#define BOOST_FUNCTION_ARGS a1, a2, a3, a4, a5, a6, a7, a8, a9
-#define BOOST_FUNCTION_FUNCTION function9
-#define BOOST_FUNCTION_BASE function9_base
-#define BOOST_FUNCTION_INVOKER_BASE invoker_base9
-#define BOOST_FUNCTION_FUNCTION_INVOKER function_invoker9
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER void_function_invoker9
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker9
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker9
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker9
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker9
+#define BOOST_FUNCTION_TEMPLATE_PARMS typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8
+#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_NUM_ARGS
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_OTHER_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_NOT_0_ARGS
+#undef BOOST_FUNCTION_NOT_0_PARMS
 #undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_BASE
-#undef BOOST_FUNCTION_INVOKER_BASE
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_PARMS
+#undef BOOST_FUNCTION_TEMPLATE_ARGS
+#undef BOOST_FUNCTION_TEMPLATE_PARMS
+#undef BOOST_FUNCTION_NUM_ARGS
 
-#endif // BOOST_FUNCTION9_HPP
+#endif // BOOST_FUNCTION_FUNCTION9_HEADER

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, 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.
@@ -23,54 +23,31 @@
 #include <typeinfo>
 #include <boost/config.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/mem_fn.hpp>
+#include <boost/ref.hpp>
+#include <boost/pending/ct_if.hpp>
+
+#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406
+#  define BOOST_FUNCTION_TARGET_FIX(x) x
+#else
+#  define BOOST_FUNCTION_TARGET_FIX(x)
+#endif // not MSVC
+
+#ifdef BOOST_FUNCTION_SILENT_DEPRECATED
+#  define BOOST_FUNCTION_DEPRECATED_PRE
+#  define BOOST_FUNCTION_DEPRECATED_INNER
+#else
+#  if defined (BOOST_MSVC) && (BOOST_MSVC >= 1300)
+#    define BOOST_FUNCTION_DEPRECATED_PRE __declspec(deprecated)
+#    define BOOST_FUNCTION_DEPRECATED_INNER
+#  else
+#    define BOOST_FUNCTION_DEPRECATED_PRE
+#    define BOOST_FUNCTION_DEPRECATED_INNER int deprecated;
+#  endif
+#endif
 
 namespace boost {
   namespace detail {
     namespace function {
-      /*
-       * The 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 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 
@@ -115,30 +92,49 @@ namespace boost {
 
       // The operation type to perform on the given functor/function pointer
       enum functor_manager_operation_type { 
-        clone_functor, 
-        destroy_functor,
-        retrieve_type_info
+        clone_functor_tag, 
+        destroy_functor_tag
       };
 
       // Tags used to decide between different types of functions
       struct function_ptr_tag {};
       struct function_obj_tag {};
       struct member_ptr_tag {};
+      struct function_obj_ref_tag {};
+      struct stateless_function_obj_tag {};
 
       template<typename F>
       class get_function_tag
       {
-	typedef typename IF<(is_pointer<F>::value),
+        typedef typename ct_if<(is_pointer<F>::value),
                             function_ptr_tag,
                             function_obj_tag>::type ptr_or_obj_tag;
 
+        typedef typename ct_if<(is_member_pointer<F>::value),
+                            member_ptr_tag,
+                            ptr_or_obj_tag>::type ptr_or_obj_or_mem_tag;
+
+        typedef typename ct_if<(is_reference_wrapper<F>::value),
+                             function_obj_ref_tag,
+                             ptr_or_obj_or_mem_tag>::type or_ref_tag;
+
       public:
-	typedef typename IF<(is_member_pointer<F>::value),
-			    member_ptr_tag,
-			    ptr_or_obj_tag>::type type;
+        typedef typename ct_if<(is_stateless<F>::value),
+                            stateless_function_obj_tag,
+                            or_ref_tag>::type type;
       };
 
-#ifndef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
+      // 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, 
+                                         functor_manager_operation_type op)
+      {
+        if (op == clone_functor_tag)
+          return f;
+        else
+          return 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. 
@@ -148,25 +144,17 @@ namespace boost {
       {
       private:
         typedef Functor functor_type;
-#  ifndef BOOST_NO_STD_ALLOCATOR
-        typedef typename Allocator::template rebind<functor_type>::other 
-          allocator_type;
-        typedef typename allocator_type::pointer pointer_type;
-#  else
-        typedef functor_type* pointer_type;
-#  endif // BOOST_NO_STD_ALLOCATOR
 
         // For function pointers, the manager is trivial
         static inline any_pointer
-        manager(any_pointer function_ptr, functor_manager_operation_type op,
+        manager(any_pointer function_ptr, 
+                functor_manager_operation_type op,
                 function_ptr_tag)
         {
-          if (op == clone_functor)
+          if (op == clone_functor_tag)
             return function_ptr;
-          else if (op == destroy_functor)
-            return any_pointer(static_cast<void (*)()>(0));
           else
-            return any_pointer(&typeid(Functor));
+            return any_pointer(static_cast<void (*)()>(0));
         }
 
         // For function object pointers, we clone the pointer to each 
@@ -176,11 +164,19 @@ namespace boost {
                 functor_manager_operation_type op,
                 function_obj_tag)
         {
+#ifndef BOOST_NO_STD_ALLOCATOR
+        typedef typename Allocator::template rebind<functor_type>::other 
+          allocator_type;
+        typedef typename allocator_type::pointer pointer_type;
+#else
+        typedef functor_type* pointer_type;
+#endif // BOOST_NO_STD_ALLOCATOR
+
 #  ifndef BOOST_NO_STD_ALLOCATOR
           allocator_type allocator;
 #  endif // BOOST_NO_STD_ALLOCATOR
 
-          if (op == clone_functor) {
+          if (op == clone_functor_tag) {
             functor_type* f = 
               static_cast<functor_type*>(function_obj_ptr.obj_ptr);
 
@@ -196,7 +192,7 @@ namespace boost {
 #  endif // BOOST_NO_STD_ALLOCATOR
             return any_pointer(static_cast<void*>(new_f));
           }
-          else if (op == destroy_functor) {
+          else {
             /* Cast from the void pointer to the functor pointer type */
             functor_type* f = 
               reinterpret_cast<functor_type*>(function_obj_ptr.obj_ptr);
@@ -215,9 +211,6 @@ namespace boost {
 
             return any_pointer(static_cast<void*>(0));
           }
-          else {
-            return any_pointer(&typeid(Functor));
-          }
         }
       public:
         /* Dispatch to an appropriate manager based on whether we have a
@@ -225,14 +218,10 @@ namespace boost {
         static any_pointer
         manage(any_pointer functor_ptr, functor_manager_operation_type op)
         {
-          typedef typename IF<(is_pointer<functor_type>::value),
-                              function_ptr_tag,
-                              function_obj_tag>::type tag_type;
-
+          typedef typename get_function_tag<functor_type>::type tag_type;
           return manager(functor_ptr, op, tag_type());
         }
       };
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
 
       // value=1 if the given type is not "unusable"
       template<typename T>
@@ -278,29 +267,22 @@ namespace boost {
    */
   class function_base 
   {
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-  public:
-    function_base() : impl(0) {}
-
-    bool empty() const { return impl == 0; }
-
-    
-  protected:
-    void* impl; // Derived class is responsible for knowing the real type
-#else
   public:
     function_base() : manager(0), functor(static_cast<void*>(0)) {}
     
     // Is this function empty?
     bool empty() const { return !manager; }
     
-  protected:
+  public: // should be protected, but GCC 2.95.3 will fail to allow access
     detail::function::any_pointer (*manager)(
                            detail::function::any_pointer, 
                            detail::function::functor_manager_operation_type);
     detail::function::any_pointer functor;
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
 
+#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() {};
@@ -314,6 +296,7 @@ namespace boost {
 
     safe_bool operator!() const
       { return (this->empty())? &dummy::nonnull : 0; }
+#endif
   };
 
   /* Poison comparison between Boost.Function objects (because it is 
@@ -327,92 +310,14 @@ namespace boost {
 
   namespace detail {
     namespace function {
-      /**
-       * Determine if the given target is empty.
-       */
-
-      // Fallback - assume target is not empty
-      inline bool has_empty_target(...) 
-      { 
-        return false; 
-      }
-    
-      // If the target is a 'function', query the empty() method
-      inline bool has_empty_target(const function_base* af) 
-      { 
-        return af->empty();
+      inline bool has_empty_target(const function_base* f)
+      {
+        return f->empty();
       }
 
-      // If the target is a 'function', query the empty() method
-      inline bool has_empty_target(const function_base& af) 
-      { 
-        return af.empty();
-      }
-    
-      // A function pointer is empty if it is null
-      template<typename R>
-      inline bool has_empty_target(R (*f)())
+      inline bool has_empty_target(...)
       {
-        return f == 0;
-      }
-    
-      template<typename R, typename T1>
-      inline bool has_empty_target(R (*f)(T1))
-      {
-        return f == 0;
-      }
-    
-      template<typename R, typename T1, typename T2>
-      inline bool has_empty_target(R (*f)(T1, T2))
-      {
-        return f == 0;
-      }
-    
-      template<typename R, typename T1, typename T2, typename T3>
-      inline bool has_empty_target(R (*f)(T1, T2, T3))
-      {
-        return f == 0;
-      }
-
-      template<typename R, typename T1, typename T2, typename T3, typename T4>
-      inline bool has_empty_target(R (*f)(T1, T2, T3, T4))
-      {
-        return f == 0;
-      }
-
-      template<typename R, typename T1, typename T2, typename T3, typename T4, 
-               typename T5>
-      inline bool has_empty_target(R (*f)(T1, T2, T3, T4, T5))
-      {
-        return f == 0;
-      }
-
-      template<typename R, typename T1, typename T2, typename T3, typename T4, 
-               typename T5, typename T6>
-      inline bool has_empty_target(R (*f)(T1, T2, T3, T4, T5, T6))
-      {
-        return f == 0;
-      }
-
-      template<typename R, typename T1, typename T2, typename T3, typename T4, 
-               typename T5, typename T6, typename T7>
-      inline bool has_empty_target(R (*f)(T1, T2, T3, T4, T5, T6, T7))
-      {
-        return f == 0;
-      }
-
-      template<typename R, typename T1, typename T2, typename T3, typename T4, 
-               typename T5, typename T6, typename T7, typename T8>
-      inline bool has_empty_target(R (*f)(T1, T2, T3, T4, T5, T6, T7, T8))
-      {
-        return f == 0;
-      }
-
-      template<typename R, typename T1, typename T2, typename T3, typename T4, 
-               typename T5, typename T6, typename T7, typename T8, typename T9>
-      inline bool has_empty_target(R (*f)(T1, T2, T3, T4, T5, T6, T7, T8, T9))
-      {
-        return f == 0;
+        return false;
       }
     } // end namespace function
   } // end namespace detail
@@ -424,14 +329,18 @@ namespace boost {
     inline void postcall(const function_base*) {}
   };
 
-  // The default function mixin does nothing. The assignment and copy-construction operators
-  // are all defined because MSVC defines broken versions.
-  struct empty_function_mixin {
-    empty_function_mixin() {};
-    empty_function_mixin(const empty_function_mixin&) {};
+  // The default function mixin does nothing. The assignment and
+  // copy-construction operators are all defined because MSVC defines broken
+  // versions.
+  struct empty_function_mixin 
+  {
+    empty_function_mixin() {}
+    empty_function_mixin(const empty_function_mixin&) {}
 
     empty_function_mixin& operator=(const empty_function_mixin&) 
-    {return *this; }
+    {
+      return *this; 
+    }
   };
 }
 

include/boost/function/function_template.hpp

@@ -13,20 +13,17 @@
 
 // For more information, see http://www.boost.org
 
-/* Note: this header is a header template and must NOT have multiple-inclusion
-   protection. */
+// Note: this header is a header template and must NOT have multiple-inclusion
+// protection. 
 
-#include <cassert>
-#include <algorithm>
-
-// Zero-initialize the "invoker" member of the functionN object.
-// The invoker member only exists when we aren't using the virtual
-// function implementation
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-#  define BOOST_FUNCTION_INIT
-#else
-#  define BOOST_FUNCTION_INIT , invoker(0)
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
+#ifndef BOOST_FUNCTION_FUNCTION_TEMPLATE_HPP
+#define BOOST_FUNCTION_FUNCTION_TEMPLATE_HPP
+#  include <cassert>
+#  include <algorithm>
+#  include <boost/config.hpp>
+#  include <boost/function/function_base.hpp>
+#  include <boost/mem_fn.hpp>
+#endif // BOOST_FUNCTION_FUNCTION_TEMPLATE_HPP
 
 // Type of the default allocator
 #ifndef BOOST_NO_STD_ALLOCATOR
@@ -35,164 +32,59 @@
 #  define BOOST_FUNCTION_DEFAULT_ALLOCATOR int
 #endif // BOOST_NO_STD_ALLOCATOR
 
+// Comma if nonzero number of arguments
+#if BOOST_FUNCTION_NUM_ARGS == 0
+#  define BOOST_FUNCTION_COMMA 
+#else
+#  define BOOST_FUNCTION_COMMA ,
+#endif // BOOST_FUNCTION_NUM_ARGS > 0
+
+// Class names used in this version of the code
+#define BOOST_FUNCTION_FUNCTION BOOST_JOIN(function,BOOST_FUNCTION_NUM_ARGS)
+#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) 
+#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER \
+  BOOST_JOIN(function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
+#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER \
+  BOOST_JOIN(void_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
+#define BOOST_FUNCTION_STATELESS_FUNCTION_OBJ_INVOKER \
+  BOOST_JOIN(stateless_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
+#define BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER \
+  BOOST_JOIN(stateless_void_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
+#define BOOST_FUNCTION_GET_FUNCTION_INVOKER \
+  BOOST_JOIN(get_function_invoker,BOOST_FUNCTION_NUM_ARGS)
+#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER \
+  BOOST_JOIN(get_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
+#define BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER \
+  BOOST_JOIN(get_stateless_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
+
 namespace boost {
   namespace detail {
     namespace function {
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-      template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
-      struct BOOST_FUNCTION_INVOKER_BASE
-      {
-        virtual ~BOOST_FUNCTION_INVOKER_BASE() {}
-        virtual R call(BOOST_FUNCTION_PARMS) const = 0;
-        virtual BOOST_FUNCTION_INVOKER_BASE* clone() const = 0;
-        virtual void destroy(BOOST_FUNCTION_INVOKER_BASE*) = 0;
-      };
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-
       template<
         typename FunctionPtr,
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        typename Allocator,
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
         typename R BOOST_FUNCTION_COMMA
         BOOST_FUNCTION_TEMPLATE_PARMS
         >
       struct BOOST_FUNCTION_FUNCTION_INVOKER
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        : public BOOST_FUNCTION_INVOKER_BASE<
-                   R BOOST_FUNCTION_COMMA
-                   BOOST_FUNCTION_TEMPLATE_ARGS
-                 >
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
       {
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        explicit BOOST_FUNCTION_FUNCTION_INVOKER(FunctionPtr f) : 
-          function_ptr(f) {}
-
-        virtual R call(BOOST_FUNCTION_PARMS) const
-        {
-          return function_ptr(BOOST_FUNCTION_ARGS);
-        }
-
-        virtual BOOST_FUNCTION_FUNCTION_INVOKER* clone() const
-        {
-#  ifdef BOOST_NO_STD_ALLOCATOR
-          return new BOOST_FUNCTION_FUNCTION_INVOKER(function_ptr);
-#  else
-          typedef typename Allocator::
-            template rebind<BOOST_FUNCTION_FUNCTION_INVOKER>::other 
-            allocator_type;
-          typedef typename allocator_type::pointer pointer_type;
-          allocator_type allocator;
-
-          pointer_type copy = allocator.allocate(1);
-          allocator.construct(copy, *this);
-          return static_cast<BOOST_FUNCTION_FUNCTION_INVOKER*>(copy);
-#  endif // BOOST_NO_STD_ALLOCATOR
-        }
-
-        virtual void destroy(BOOST_FUNCTION_INVOKER_BASE<
-                               R BOOST_FUNCTION_COMMA
-                               BOOST_FUNCTION_TEMPLATE_ARGS
-                             >* p)
-        {
-#  ifdef BOOST_NO_STD_ALLOCATOR
-          delete p;
-#  else
-          BOOST_FUNCTION_FUNCTION_INVOKER* victim = 
-            dynamic_cast<BOOST_FUNCTION_FUNCTION_INVOKER*>(p);
-
-          typedef typename Allocator::
-            template rebind<BOOST_FUNCTION_FUNCTION_INVOKER>::other 
-            allocator_type;
-          typedef typename allocator_type::pointer pointer_type;
-          allocator_type allocator;
-
-          allocator.destroy(victim);
-          allocator.deallocate(victim, 1);
-#  endif // BOOST_NO_STD_ALLOCATOR
-        }
-
-      private:
-        mutable FunctionPtr function_ptr;
-#else
         static R invoke(any_pointer function_ptr BOOST_FUNCTION_COMMA
                         BOOST_FUNCTION_PARMS)
         {
           FunctionPtr f = reinterpret_cast<FunctionPtr>(function_ptr.func_ptr);
           return f(BOOST_FUNCTION_ARGS);
         }
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
       };
 
       template<
         typename FunctionPtr,
-#  ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        typename Allocator,
-#  endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
         typename R BOOST_FUNCTION_COMMA
         BOOST_FUNCTION_TEMPLATE_PARMS
         >
       struct BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#  ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        : public BOOST_FUNCTION_INVOKER_BASE<
-                   unusable BOOST_FUNCTION_COMMA
-                   BOOST_FUNCTION_TEMPLATE_ARGS
-                 >
-#  endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
       {
-#  ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        explicit BOOST_FUNCTION_VOID_FUNCTION_INVOKER(FunctionPtr f) : 
-          function_ptr(f) {}
-
-        virtual unusable call(BOOST_FUNCTION_PARMS) const
-        {
-          function_ptr(BOOST_FUNCTION_ARGS);
-          return unusable();
-        }
-
-        virtual BOOST_FUNCTION_VOID_FUNCTION_INVOKER* clone() const
-        {
-#    ifdef BOOST_NO_STD_ALLOCATOR
-          return new BOOST_FUNCTION_VOID_FUNCTION_INVOKER(function_ptr);
-#    else
-          typedef typename Allocator::
-            template rebind<BOOST_FUNCTION_VOID_FUNCTION_INVOKER>::other
-            allocator_type;
-          typedef typename allocator_type::pointer pointer_type;
-          allocator_type allocator;
-
-          pointer_type copy = allocator.allocate(1);
-          allocator.construct(copy, *this);
-          return static_cast<BOOST_FUNCTION_VOID_FUNCTION_INVOKER*>(copy);
-#    endif // BOOST_NO_STD_ALLOCATOR
-        }
-
-        virtual void destroy(BOOST_FUNCTION_INVOKER_BASE<
-                               unusable BOOST_FUNCTION_COMMA
-                               BOOST_FUNCTION_TEMPLATE_ARGS
-                             >* p)
-        {
-#    ifdef BOOST_NO_STD_ALLOCATOR
-          delete p;
-#    else
-          BOOST_FUNCTION_VOID_FUNCTION_INVOKER* victim =
-            dynamic_cast<BOOST_FUNCTION_VOID_FUNCTION_INVOKER*>(p);
-
-          typedef typename Allocator::
-            template rebind<BOOST_FUNCTION_VOID_FUNCTION_INVOKER>::other
-            allocator_type;
-          typedef typename allocator_type::pointer pointer_type;
-          allocator_type allocator;
-
-          allocator.destroy(victim);
-          allocator.deallocate(victim, 1);
-#    endif // BOOST_NO_STD_ALLOCATOR
-        }
-
-      private:
-        mutable FunctionPtr function_ptr;
-#  else
         static unusable invoke(any_pointer function_ptr BOOST_FUNCTION_COMMA
                                BOOST_FUNCTION_PARMS)
 
@@ -201,188 +93,88 @@ namespace boost {
           f(BOOST_FUNCTION_ARGS);
           return unusable();
         }
-#  endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
       };
 
       template<
         typename FunctionObj,
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        typename Allocator,
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
         typename R BOOST_FUNCTION_COMMA
         BOOST_FUNCTION_TEMPLATE_PARMS
       >
       struct BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        : public BOOST_FUNCTION_INVOKER_BASE<
-                   R BOOST_FUNCTION_COMMA
-                   BOOST_FUNCTION_TEMPLATE_ARGS
-                 >
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
       {
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        explicit BOOST_FUNCTION_FUNCTION_OBJ_INVOKER(const FunctionObj& f) :
-          function_obj(f) {}
-
-        virtual R call(BOOST_FUNCTION_PARMS) const
-        {
-          return function_obj(BOOST_FUNCTION_ARGS);
-        }
-
-        virtual BOOST_FUNCTION_FUNCTION_OBJ_INVOKER* clone() const
-        {
-#ifdef BOOST_NO_STD_ALLOCATOR
-          return new BOOST_FUNCTION_FUNCTION_OBJ_INVOKER(function_obj);
-#else
-          typedef typename Allocator::
-            template rebind<BOOST_FUNCTION_FUNCTION_OBJ_INVOKER>::other
-            allocator_type;
-          typedef typename allocator_type::pointer pointer_type;
-          allocator_type allocator;
-
-          pointer_type copy = allocator.allocate(1);
-          allocator.construct(copy, *this);
-          return static_cast<BOOST_FUNCTION_FUNCTION_OBJ_INVOKER*>(copy);
-#endif // BOOST_NO_STD_ALLOCATOR
-        }
-
-        virtual void destroy(BOOST_FUNCTION_INVOKER_BASE<
-                               R BOOST_FUNCTION_COMMA
-                               BOOST_FUNCTION_TEMPLATE_ARGS
-                             >* p)
-        {
-#ifdef BOOST_NO_STD_ALLOCATOR
-          delete p;
-#else
-          BOOST_FUNCTION_FUNCTION_OBJ_INVOKER* victim =
-            dynamic_cast<BOOST_FUNCTION_FUNCTION_OBJ_INVOKER*>(p);
-
-          typedef typename Allocator::
-            template rebind<BOOST_FUNCTION_FUNCTION_OBJ_INVOKER>::other 
-            allocator_type;
-          typedef typename allocator_type::pointer pointer_type;
-          allocator_type allocator;
-
-          allocator.destroy(victim);
-          allocator.deallocate(victim, 1);
-#endif // BOOST_NO_STD_ALLOCATOR
-        }
-
-      private:
-        mutable FunctionObj function_obj;
-#else
         static R invoke(any_pointer function_obj_ptr BOOST_FUNCTION_COMMA
                         BOOST_FUNCTION_PARMS)
 
         {
-          FunctionObj* f = static_cast<FunctionObj*>(function_obj_ptr.obj_ptr);
+          FunctionObj* f = (FunctionObj*)(function_obj_ptr.obj_ptr);
           return (*f)(BOOST_FUNCTION_ARGS);
         }
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
       };
 
       template<
         typename FunctionObj,
-#  ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        typename Allocator,
-#  endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
         typename R BOOST_FUNCTION_COMMA
         BOOST_FUNCTION_TEMPLATE_PARMS
       >
       struct BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#  ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        : public BOOST_FUNCTION_INVOKER_BASE<
-                   unusable BOOST_FUNCTION_COMMA
-                   BOOST_FUNCTION_TEMPLATE_ARGS
-                 >
-#  endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
       {
-#  ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        explicit BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER(const FunctionObj& f)
-          : function_obj(f) {}
-
-        virtual unusable call(BOOST_FUNCTION_PARMS) const
-        {
-          function_obj(BOOST_FUNCTION_ARGS);
-          return unusable();
-        }
-
-        virtual BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER* clone() const
-        {
-#  ifdef BOOST_NO_STD_ALLOCATOR
-          return new BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER(function_obj);
-#  else
-          typedef typename Allocator::
-            template rebind<BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER>::other
-            allocator_type;
-          typedef typename allocator_type::pointer pointer_type;
-          allocator_type allocator;
-
-          pointer_type copy = allocator.allocate(1);
-          allocator.construct(copy, *this);
-          return static_cast<BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER*>(copy);
-#  endif // BOOST_NO_STD_ALLOCATOR
-        }
-
-        virtual void destroy(BOOST_FUNCTION_INVOKER_BASE<
-                               unusable BOOST_FUNCTION_COMMA
-                               BOOST_FUNCTION_TEMPLATE_ARGS
-                             >* p)
-        {
-#  ifdef BOOST_NO_STD_ALLOCATOR
-          delete p;
-#  else
-          BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER* victim =
-            dynamic_cast<BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER*>(p);
-
-          typedef typename Allocator::
-            template rebind<BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER>::other
-            allocator_type;
-          typedef typename allocator_type::pointer pointer_type;
-          allocator_type allocator;
-
-          allocator.destroy(victim);
-          allocator.deallocate(victim, 1);
-#  endif // BOOST_NO_STD_ALLOCATOR
-        }
-
-      private:
-        mutable FunctionObj function_obj;
-#  else
         static unusable invoke(any_pointer function_obj_ptr 
                                BOOST_FUNCTION_COMMA
                                BOOST_FUNCTION_PARMS)
 
         {
-          FunctionObj* f = static_cast<FunctionObj*>(function_obj_ptr.obj_ptr);
+          FunctionObj* f = (FunctionObj*)(function_obj_ptr.obj_ptr);
           (*f)(BOOST_FUNCTION_ARGS);
           return unusable();
         }
-#  endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
+      };
+
+      template<
+        typename FunctionObj,
+        typename R BOOST_FUNCTION_COMMA
+        BOOST_FUNCTION_TEMPLATE_PARMS
+      >
+      struct BOOST_FUNCTION_STATELESS_FUNCTION_OBJ_INVOKER
+      {
+        static R invoke(any_pointer BOOST_FUNCTION_COMMA BOOST_FUNCTION_PARMS)
+        {
+          FunctionObj f = FunctionObj();
+          return f(BOOST_FUNCTION_ARGS);
+        }
+      };
+
+      template<
+        typename FunctionObj,
+        typename R BOOST_FUNCTION_COMMA
+        BOOST_FUNCTION_TEMPLATE_PARMS
+      >
+      struct BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER
+      {
+        static unusable invoke(any_pointer BOOST_FUNCTION_COMMA 
+                               BOOST_FUNCTION_PARMS)
+
+        {
+          FunctionObj f = FunctionObj();
+          f(BOOST_FUNCTION_ARGS);
+          return unusable();
+        }
       };
 
       template<
         typename FunctionPtr,
-        typename Allocator,
         typename R BOOST_FUNCTION_COMMA
         BOOST_FUNCTION_TEMPLATE_PARMS
       >
       struct BOOST_FUNCTION_GET_FUNCTION_INVOKER
       {
-        typedef typename IF<(is_void<R>::value),
+        typedef typename ct_if<(is_void<R>::value),
                             BOOST_FUNCTION_VOID_FUNCTION_INVOKER<
                             FunctionPtr,
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-                            Allocator,
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
                             R BOOST_FUNCTION_COMMA
                             BOOST_FUNCTION_TEMPLATE_ARGS
                           >,
                           BOOST_FUNCTION_FUNCTION_INVOKER<
                             FunctionPtr,
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-                            Allocator,
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
                             R BOOST_FUNCTION_COMMA
                             BOOST_FUNCTION_TEMPLATE_ARGS
                           >
@@ -391,104 +183,133 @@ namespace boost {
 
       template<
         typename FunctionObj,
-        typename Allocator,
         typename R BOOST_FUNCTION_COMMA
         BOOST_FUNCTION_TEMPLATE_PARMS
        >
       struct BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
       {
-        typedef typename IF<(is_void<R>::value),
+        typedef typename ct_if<(is_void<R>::value),
                             BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER<
                             FunctionObj,
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-                            Allocator,
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
                             R BOOST_FUNCTION_COMMA
                             BOOST_FUNCTION_TEMPLATE_ARGS
                           >,
                           BOOST_FUNCTION_FUNCTION_OBJ_INVOKER<
                             FunctionObj,
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-                            Allocator,
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
                             R BOOST_FUNCTION_COMMA
                             BOOST_FUNCTION_TEMPLATE_ARGS
                           >
                        >::type type;
       };
+
+      template<
+        typename FunctionObj,
+        typename R BOOST_FUNCTION_COMMA
+        BOOST_FUNCTION_TEMPLATE_PARMS
+       >
+      struct BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER
+      {
+        typedef typename ct_if<(is_void<R>::value),
+                            BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER<
+                            FunctionObj,
+                            R BOOST_FUNCTION_COMMA
+                            BOOST_FUNCTION_TEMPLATE_ARGS
+                          >,
+                          BOOST_FUNCTION_STATELESS_FUNCTION_OBJ_INVOKER<
+                            FunctionObj,
+                            R BOOST_FUNCTION_COMMA
+                            BOOST_FUNCTION_TEMPLATE_ARGS
+                          >
+                       >::type type;
+      };
+
     } // end namespace function
   } // end namespace detail
 
   template<
     typename R BOOST_FUNCTION_COMMA
     BOOST_FUNCTION_TEMPLATE_PARMS,
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
     typename Policy    = empty_function_policy,
     typename Mixin     = empty_function_mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
     typename Allocator = BOOST_FUNCTION_DEFAULT_ALLOCATOR
   >
-  class BOOST_FUNCTION_FUNCTION : public function_base, public Mixin
+  class BOOST_FUNCTION_FUNCTION : public function_base
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                                , public Mixin
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
   {
+    typedef typename detail::function::function_return_type<R>::type 
+      internal_result_type;
+
   public:
     BOOST_STATIC_CONSTANT(int, args = BOOST_FUNCTION_NUM_ARGS);
     
 #if BOOST_FUNCTION_NUM_ARGS == 1
-    typedef T1 argument_type;
+    typedef T0 argument_type;
 #elif BOOST_FUNCTION_NUM_ARGS == 2
-    typedef T1 first_argument_type;
-    typedef T2 second_argument_type;
+    typedef T0 first_argument_type;
+    typedef T1 second_argument_type;
 #endif
-    typedef typename detail::function::function_return_type<R>::type 
-      result_type;
+
+#ifndef BOOST_NO_VOID_RETURNS
+    typedef R         result_type;
+#else
+    typedef internal_result_type result_type;
+#endif // BOOST_NO_VOID_RETURNS
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
     typedef Policy    policy_type;
     typedef Mixin     mixin_type;
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
     typedef Allocator allocator_type;
     typedef BOOST_FUNCTION_FUNCTION self_type;
 
-  private:    
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-    typedef detail::function::BOOST_FUNCTION_INVOKER_BASE<
-                                result_type BOOST_FUNCTION_COMMA
-                                BOOST_FUNCTION_TEMPLATE_ARGS
-                              >
-          impl_type;
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-
-  public:
-    BOOST_FUNCTION_FUNCTION() : function_base(), Mixin() BOOST_FUNCTION_INIT {}
+    BOOST_FUNCTION_FUNCTION() : function_base()
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+                              , Mixin()
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+                              , invoker(0) {}
 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
     explicit BOOST_FUNCTION_FUNCTION(const Mixin& m) : 
-      function_base(), Mixin(m) BOOST_FUNCTION_INIT 
+      function_base(), 
+      Mixin(m), 
+      invoker(0) 
     {
     }
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
 
     // MSVC chokes if the following two constructors are collapsed into
     // one with a default parameter.
     template<typename Functor>
-    BOOST_FUNCTION_FUNCTION(const Functor& f) :
-      function_base(), Mixin() BOOST_FUNCTION_INIT
+    BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f) :
+      function_base(), 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+      Mixin(), 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+      invoker(0)
     {
       this->assign_to(f);
     }
 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
     template<typename Functor>
-    BOOST_FUNCTION_FUNCTION(const Functor& f, const Mixin& m) :
-      function_base(), Mixin(m) BOOST_FUNCTION_INIT
+    BOOST_FUNCTION_FUNCTION(Functor f, const Mixin& m) :
+      function_base(), 
+      Mixin(m), 
+      invoker(0)
     {
       this->assign_to(f);
     }
-
-#ifdef __BORLANDC__
-    template<typename Functor>
-    BOOST_FUNCTION_FUNCTION(Functor* f, const Mixin& m = Mixin()) : 
-      function_base(), Mixin(m) BOOST_FUNCTION_INIT
-    {
-      this->assign_to(f);
-    }
-#endif // __BORLANDC__
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
 
     BOOST_FUNCTION_FUNCTION(const BOOST_FUNCTION_FUNCTION& f) :
-      function_base(), Mixin(static_cast<const Mixin&>(f))
-      BOOST_FUNCTION_INIT
+      function_base(),
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+      Mixin(static_cast<const Mixin&>(f)), 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+      invoker(0)
     {
       this->assign_to_own(f);
     }
@@ -499,19 +320,24 @@ namespace boost {
     {
       assert(!this->empty());
 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
       policy_type policy;
       policy.precall(this);
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
 
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-      const impl_type* i = reinterpret_cast<const impl_type*>(impl);
-      result_type result = i->call(BOOST_FUNCTION_ARGS);
-#else
-      result_type result = invoker(functor BOOST_FUNCTION_COMMA
-                                   BOOST_FUNCTION_ARGS);
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
+      internal_result_type result = invoker(function_base::functor 
+                                            BOOST_FUNCTION_COMMA
+                                            BOOST_FUNCTION_ARGS);
 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
       policy.postcall(this);
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+
+#ifndef BOOST_NO_VOID_RETURNS
+      return static_cast<result_type>(result);
+#else
       return result;
+#endif // BOOST_NO_VOID_RETURNS
     }
 
     // The distinction between when to use BOOST_FUNCTION_FUNCTION and
@@ -520,34 +346,26 @@ namespace boost {
     // handle BOOST_FUNCTION_FUNCTION as the type of the temporary to 
     // construct.
     template<typename Functor>
-    BOOST_FUNCTION_FUNCTION& operator=(const Functor& f)
+    BOOST_FUNCTION_FUNCTION& 
+    operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
     {
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
       self_type(f, static_cast<const Mixin&>(*this)).swap(*this);
+#else
+      self_type(f).swap(*this);
+#endif // BOOST_FUNCTION_NO_DEPRECATED
       return *this;
     }
 
-#ifdef __BORLANDC__
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
     template<typename Functor>
-    BOOST_FUNCTION_FUNCTION& operator=(Functor* f)
-    {
-      self_type(f, static_cast<const Mixin&>(*this)).swap(*this);
-      return *this;
-    }
-#endif // __BORLANDC__
-
-    template<typename Functor>
-    void set(const Functor& f)
+    BOOST_FUNCTION_DEPRECATED_PRE
+    void set(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
     {
+      BOOST_FUNCTION_DEPRECATED_INNER
       self_type(f, static_cast<const Mixin&>(*this)).swap(*this);
     }
-
-#ifdef __BORLANDC__
-    template<typename Functor>
-    void set(Functor* f)
-    {
-      self_type(f, static_cast<const Mixin&>(*this)).swap(*this);
-    }
-#endif // __BORLANDC__
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
 
     // Assignment from another BOOST_FUNCTION_FUNCTION
     BOOST_FUNCTION_FUNCTION& operator=(const BOOST_FUNCTION_FUNCTION& f)
@@ -559,76 +377,63 @@ namespace boost {
       return *this;
     }
 
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
     // Assignment from another BOOST_FUNCTION_FUNCTION
+    BOOST_FUNCTION_DEPRECATED_PRE
     void set(const BOOST_FUNCTION_FUNCTION& f)
     {
+      BOOST_FUNCTION_DEPRECATED_INNER
       if (&f == this)
         return;
 
       self_type(f).swap(*this);
     }
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
 
     void swap(BOOST_FUNCTION_FUNCTION& other)
     {
       if (&other == this)
         return;
 
-#ifndef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-      std::swap(manager, other.manager);
-      std::swap(functor, other.functor);
+      std::swap(function_base::manager, other.manager);
+      std::swap(function_base::functor, other.functor);
       std::swap(invoker, other.invoker);
-#else
-      std::swap(impl, other.impl);
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-      std::swap(static_cast<Mixin&>(*this),static_cast<Mixin&>(other));
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+      std::swap(static_cast<Mixin&>(*this), static_cast<Mixin&>(other));
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
     }
 
     // Clear out a target, if there is one
     void clear()
     {
-#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-      if (impl) {
-        impl_type* i = reinterpret_cast<impl_type*>(impl);
-        i->destroy(i);
-        impl = 0;
+      if (function_base::manager) {
+        function_base::functor = 
+          function_base::manager(function_base::functor, 
+                                 detail::function::destroy_functor_tag);
       }
-#else
-      if (manager)
-        functor = manager(functor, detail::function::destroy_functor);
-    
-      manager = 0;
+
+      function_base::manager = 0;
       invoker = 0;
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
     }
 
   private:
     void assign_to_own(const BOOST_FUNCTION_FUNCTION& f)
     {
       if (!f.empty()) {
-#  ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-        impl_type* other_impl = reinterpret_cast<impl_type*>(f.impl);
-        impl = static_cast<void*>(other_impl->clone());
-#  else
         invoker = f.invoker;
-        manager = f.manager;
-        functor = f.manager(f.functor, detail::function::clone_functor);
-#  endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS      
+        function_base::manager = f.manager;
+        function_base::functor = 
+          f.manager(f.functor, detail::function::clone_functor_tag);
       }          
     }
 
     template<typename Functor>
-    void assign_to(const Functor& f)
+    void assign_to(Functor f)
     {
       typedef typename detail::function::get_function_tag<Functor>::type tag;
       this->assign_to(f, tag());
     }
 
-    template<typename MemberPtr>
-    void assign_to(MemberPtr f, detail::function::member_ptr_tag)
-    {
-      this->assign_to(mem_fn(f));
-    }
-
     template<typename FunctionPtr>
     void assign_to(FunctionPtr f, detail::function::function_ptr_tag)
     {
@@ -637,99 +442,132 @@ namespace boost {
       if (f) {
         typedef typename detail::function::BOOST_FUNCTION_GET_FUNCTION_INVOKER<
                            FunctionPtr,
-                           Allocator,
                            R BOOST_FUNCTION_COMMA
                            BOOST_FUNCTION_TEMPLATE_ARGS
                          >::type
           invoker_type;
     
-#  ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-#    ifdef BOOST_NO_STD_ALLOCATOR
-        impl_type* i = new invoker_type(f);
-#    else
-        typedef typename Allocator::template rebind<invoker_type>::other
-          allocator_type;
-        typedef typename allocator_type::pointer pointer_type;
-        allocator_type allocator;
-    
-        pointer_type copy = allocator.allocate(1);
-        new (copy) invoker_type(f);
-        impl_type* i = static_cast<impl_type*>(copy);
-#    endif // BOOST_NO_STD_ALLOCATOR
-        impl = static_cast<void*>(i);
-#  else
         invoker = &invoker_type::invoke;
-        manager = &detail::function::functor_manager<FunctionPtr, 
-                                                     Allocator>::manage;
-        functor = manager(detail::function::any_pointer(
-                            reinterpret_cast<void (*)()>(f)
+        function_base::manager = 
+          &detail::function::functor_manager<FunctionPtr, Allocator>::manage;
+        function_base::functor = 
+          function_base::manager(detail::function::any_pointer(
+                            // should be a reinterpret cast, but some compilers
+                            // insist on giving cv-qualifiers to free functions
+                            (void (*)())(f)
                           ),
-                          detail::function::clone_functor);
-#  endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
+                          detail::function::clone_functor_tag);
       }
     }  
+
+#if BOOST_FUNCTION_NUM_ARGS > 0
+    template<typename MemberPtr>
+    void assign_to(MemberPtr f, detail::function::member_ptr_tag)
+    {
+      this->assign_to(mem_fn(f));
+    }
+#endif // BOOST_FUNCTION_NUM_ARGS > 0
         
     template<typename FunctionObj>
-    void assign_to(const FunctionObj& f, detail::function::function_obj_tag)
+    void assign_to(FunctionObj f, detail::function::function_obj_tag)
     {
-      if (!detail::function::has_empty_target(&f)) {
+      if (!detail::function::has_empty_target(addressof(f))) {
         typedef 
           typename detail::function::BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
                                        FunctionObj,
-                                       Allocator,
                                        R BOOST_FUNCTION_COMMA
                                        BOOST_FUNCTION_TEMPLATE_ARGS
                                      >::type
           invoker_type;
     
-#  ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-#    ifdef BOOST_NO_STD_ALLOCATOR
-        impl_type* i = new invoker_type(f);
-#    else
-        typedef typename Allocator::template rebind<invoker_type>::other
+        invoker = &invoker_type::invoke;
+        function_base::manager = &detail::function::functor_manager<
+                                    FunctionObj, Allocator>::manage;
+#ifndef BOOST_NO_STD_ALLOCATOR
+        typedef typename Allocator::template rebind<FunctionObj>::other 
           allocator_type;
         typedef typename allocator_type::pointer pointer_type;
         allocator_type allocator;
-    
         pointer_type copy = allocator.allocate(1);
-        new (copy) invoker_type(f);
-        impl_type* i = static_cast<impl_type*>(copy);
-#    endif // BOOST_NO_STD_ALLOCATOR
-        impl = static_cast<void*>(i);
-#  else
-        invoker = &invoker_type::invoke;
-        manager = &detail::function::functor_manager<FunctionObj, 
-                                                     Allocator>::manage;
-        functor = 
-          manager(detail::function::any_pointer(const_cast<FunctionObj*>(&f)),
-                  detail::function::clone_functor);
-#  endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
+        allocator.construct(copy, f);
+
+        // Get back to the original pointer type
+        FunctionObj* new_f = static_cast<FunctionObj*>(copy);
+#else
+        FunctionObj* new_f = new FunctionObj(f);
+#endif // BOOST_NO_STD_ALLOCATOR
+        function_base::functor = 
+          detail::function::any_pointer(static_cast<void*>(new_f));
       }
     }
     
-#ifndef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
-    typedef result_type (*invoker_type)(detail::function::any_pointer
-                                        BOOST_FUNCTION_COMMA
-                                        BOOST_FUNCTION_TEMPLATE_ARGS);
+    template<typename FunctionObj>
+    void assign_to(const reference_wrapper<FunctionObj>& f, 
+                   detail::function::function_obj_ref_tag)
+    {
+      if (!detail::function::has_empty_target(f.get_pointer())) {
+        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::manager(
+            detail::function::any_pointer(
+              const_cast<FunctionObj*>(f.get_pointer())),
+            detail::function::clone_functor_tag);
+      }
+    }
+    
+    template<typename FunctionObj>
+    void assign_to(FunctionObj, detail::function::stateless_function_obj_tag)
+    {
+      typedef 
+          typename detail::function::
+                     BOOST_FUNCTION_GET_STATELESS_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 = detail::function::any_pointer(this);
+    }
+
+    typedef internal_result_type (*invoker_type)(detail::function::any_pointer
+                                                 BOOST_FUNCTION_COMMA
+                                                 BOOST_FUNCTION_TEMPLATE_ARGS);
     
     invoker_type invoker;
-#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
   };
 
   template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
-           typename Policy, typename Mixin, typename Allocator>
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
+           typename Policy, typename Mixin, 
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
+           typename Allocator>
   inline void swap(BOOST_FUNCTION_FUNCTION<
                      R BOOST_FUNCTION_COMMA
                      BOOST_FUNCTION_TEMPLATE_ARGS ,
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
                      Policy,
                      Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
                      Allocator
                    >& f1,
                    BOOST_FUNCTION_FUNCTION<
                      R BOOST_FUNCTION_COMMA 
                      BOOST_FUNCTION_TEMPLATE_ARGS,
+#ifndef BOOST_FUNCTION_NO_DEPRECATED
                      Policy,
                      Mixin,
+#endif // ndef BOOST_FUNCTION_NO_DEPRECATED
                      Allocator
                    >& f2)
   {
@@ -739,4 +577,15 @@ namespace boost {
 
 // Cleanup after ourselves...
 #undef BOOST_FUNCTION_DEFAULT_ALLOCATOR
-#undef BOOST_FUNCTION_INIT
+#undef BOOST_FUNCTION_COMMA
+#undef BOOST_FUNCTION_FUNCTION
+#undef BOOST_FUNCTION_FUNCTION_INVOKER
+#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
+#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_STATELESS_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
+#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER
+#undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER

include/boost/function/gen_function_N.pl

@@ -0,0 +1,111 @@
+#!/usr/bin/perl -w
+#
+# 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
+use English;
+
+if ($#ARGV < 0) {
+  print "Usage: perl gen_function_N <number of arguments>\n";
+  exit;
+}
+
+
+$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";
+
+  $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;
+}

index.html

@@ -13,6 +13,7 @@
 <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="#compatibility">Compatibility Note</a></li>
   <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>
@@ -23,6 +24,48 @@
   <li><a href="doc/faq.html">Frequently Asked Questions</a></li>
 </ul>
 
+<a name="compatibility"><h2>Compatibility Note</h2></a>
+<p> Boost.Function has been partially redesigned to minimize the interface and make it cleaner. Several seldom- or never-used features of the older Boost.Function have been deprecated and will be removed in the near future. Here is a list of features that have been deprecated, the likely impact of the deprecations, and how to adjust your code:
+<ul>
+  <li>The <code>boost::function</code> class template syntax has
+  changed. The old syntax, e.g., <code>boost::function&lt;int, float,
+  double, std::string&gt;</code>, has been changed to a more natural
+  syntax <code>boost::function&lt;int (float, double,
+  std::string)&gt;</code>, where all return and argument types are
+  encoded in a single function type parameter. Any other template
+  parameters (e.g., the <code>Allocator</code>) follow this single
+  parameter.  
+
+  <p> The resolution to this change depends on the
+  abilities of your compiler: if your compiler supports template
+  partial specialization and can parse function types (most do), modify 
+  your code to use the newer
+  syntax (preferable) or directly use one of the
+  <code>function<em>N</em></code> classes whose syntax has not
+  changed. If your compiler does not support template partial
+  specialization or function types, you must take the latter option and 
+  use the numbered Boost.Function classes. This option merely requires 
+  changing types such as <code>boost::function&lt;void, int, int&gt;</code>
+  to <code>boost::function2&lt;void, int, int&gt;</code> (adding the number of
+  function arguments to the end of the class name).
+
+  <p> Support for the old syntax with the
+  <code>boost::function</code> class template will persist for a short
+  while, but will eventually be removed so that we can provide better
+  error messages and link compatibility. </li> 
+
+  <li>The invocation
+  policy template parameter (<code>Policy</code>) has been deprecated
+  and will be removed. There is no direct equivalent to this rarely
+  used feature.</li> <li>The mixin template parameter
+  (<code>Mixin</code>) has been deprecated and will be removed. There
+  is not direct equivalent to this rarely used feature.</li> <li>The
+  <code>set</code> methods have been deprecated and will be
+  removed. Use the assignment operator instead.</li>
+</ul>
+
+<p> To aid in porting to the new syntax and removing the use of deprecated features, define the preprocessor macro <code>BOOST_FUNCTION_NO_DEPRECATED</code>. This macro makes all deprecated features unavailable. A program compiled with <code>BOOST_FUNCTION_NO_DEPRECATED</code> will likely be prepared when the deprecated features are removed.
+
 <h2><a name="vspointers">Boost.Function vs. Function Pointers</a></h2>
 <p>Boost.Function has several advantages over function pointers, namely:
 
@@ -50,7 +93,7 @@ And, of course, function pointers have several advantages over Boost.Function:
 <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 requires allocating member for a copy of the function object target. The default allocator may be replaced with a faster custom allocator if the cost of this cloning becomes prohibitive.
+<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).
@@ -80,8 +123,6 @@ And, of course, function pointers have several advantages over Boost.Function:
 
 <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.
 
-<p> A compiler with strong interprocedural analysis could significantly reduce the overhead associated with virtual function calls such that the alternative used by Boost.Function is less efficient. No compiler has yet been found where this is true, but when it does occur the BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS macro can be defined to revert to the simpler implementation based on virtual functions.
-
 <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. 
 

test/deprecated_syntax_test.cpp

@@ -0,0 +1,645 @@
+// 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 <boost/function.hpp>
+#include <functional>
+#include <cassert>
+#include <string>
+
+using namespace boost;
+using std::string;
+using std::negate;
+
+int global_int;
+
+struct write_five_obj { void operator()() const { global_int = 5; } };
+struct write_three_obj { int operator()() const { global_int = 3; return 7; }};
+static void write_five() { global_int = 5; }
+static void write_three() { global_int = 3; }
+struct generate_five_obj { int operator()() const { return 5; } };
+struct generate_three_obj { int operator()() const { return 3; } };
+static int generate_five() { return 5; }
+static int generate_three() { return 3; }
+static string identity_str(const string& s) { return s; }
+static string string_cat(const string& s1, const string& s2) { return s1+s2; }
+static int sum_ints(int x, int y) { return x+y; }
+
+struct write_const_1_nonconst_2
+{
+  void operator()() { global_int = 2; }
+  void operator()() const { global_int = 1; }
+};
+
+struct add_to_obj
+{
+  add_to_obj(int v) : value(v) {}
+
+  int operator()(int x) const { return value + x; }
+
+  int value;
+};
+
+static void
+test_zero_args()
+{
+  typedef function<void> func_void_type;
+
+  write_five_obj five;
+  write_three_obj three;
+
+  // Default construction
+  func_void_type v1;
+  BOOST_TEST(v1.empty());
+
+  // Assignment to an empty function 
+  v1 = five;
+  BOOST_TEST(!v1.empty());
+
+  // Invocation of a function
+  global_int = 0;
+  v1();
+  BOOST_TEST(global_int == 5);
+
+  // clear() method
+  v1.clear();
+  BOOST_TEST(v1.empty());
+
+  // Assignment to an empty function
+  v1 = three;
+  BOOST_TEST(!v1.empty());
+
+  // Invocation and self-assignment
+  global_int = 0;
+  v1 = v1;
+  v1();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment to a non-empty function
+  v1 = five;
+
+  // Invocation and self-assignment
+  global_int = 0;
+  v1 = (v1);
+  v1();
+  BOOST_TEST(global_int == 5);
+
+  // clear()
+  v1.clear();
+  BOOST_TEST(v1.empty());
+
+  // Assignment to an empty function from a free function
+  v1 = BOOST_FUNCTION_TARGET_FIX(&) write_five;
+  BOOST_TEST(!v1.empty());
+
+  // Invocation
+  global_int = 0;
+  v1();
+  BOOST_TEST(global_int == 5);
+
+  // Assignment to a non-empty function from a free function
+  v1 = BOOST_FUNCTION_TARGET_FIX(&) write_three;
+  BOOST_TEST(!v1.empty());
+
+  // Invocation
+  global_int = 0;
+  v1();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment
+  v1 = five;
+  BOOST_TEST(!v1.empty());
+
+  // Invocation
+  global_int = 0;
+  v1();
+  BOOST_TEST(global_int == 5);
+
+  // Assignment to a non-empty function from a free function
+  v1 = &write_three;
+  BOOST_TEST(!v1.empty());
+
+  // Invocation
+  global_int = 0;
+  v1();
+  BOOST_TEST(global_int == 3);
+
+  // Construction from another function (that is empty)
+  v1.clear();
+  func_void_type v2(v1);
+  BOOST_TEST(!v2);
+
+  // Assignment to an empty function
+  v2 = three;
+  BOOST_TEST(!v2.empty());
+
+  // Invocation
+  global_int = 0;
+  v2();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment to a non-empty function
+  v2 = (five);
+
+  // Invocation
+  global_int = 0;
+  v2();
+  BOOST_TEST(global_int == 5);
+
+  v2.clear();
+  BOOST_TEST(v2.empty());
+
+  // Assignment to an empty function from a free function
+  v2 = (BOOST_FUNCTION_TARGET_FIX(&) write_five);
+  BOOST_TEST(v2);
+
+  // Invocation
+  global_int = 0;
+  v2();
+  BOOST_TEST(global_int == 5);
+
+  // Assignment to a non-empty function from a free function
+  v2 = BOOST_FUNCTION_TARGET_FIX(&) write_three;
+  BOOST_TEST(!v2.empty());
+
+  // Invocation
+  global_int = 0;
+  v2();
+  BOOST_TEST(global_int == 3);
+
+  // Swapping
+  v1 = five;
+  swap(v1, v2);
+  v2();
+  BOOST_TEST(global_int == 5);
+  v1();
+  BOOST_TEST(global_int == 3);
+  swap(v1, v2);
+  v1.clear();
+
+  // Assignment
+  v2 = five;
+  BOOST_TEST(!v2.empty());
+
+  // Invocation
+  global_int = 0;
+  v2();
+  BOOST_TEST(global_int == 5);
+
+  // Assignment to a non-empty function from a free function
+  v2 = &write_three;
+  BOOST_TEST(!v2.empty());
+
+  // Invocation
+  global_int = 0;
+  v2();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment to a function from an empty function
+  v2 = v1;
+  BOOST_TEST(v2.empty()); 
+  
+  // Assignment to a function from a function with a functor
+  v1 = three;
+  v2 = v1;
+  BOOST_TEST(!v1.empty());
+  BOOST_TEST(!v2.empty());
+
+  // Invocation
+  global_int = 0;
+  v1();
+  BOOST_TEST(global_int == 3);
+  global_int = 0;
+  v2();
+  BOOST_TEST(global_int == 3);
+
+  // Assign to a function from a function with a function
+  v2 = BOOST_FUNCTION_TARGET_FIX(&) write_five;
+  v1 = v2;
+  BOOST_TEST(!v1.empty());
+  BOOST_TEST(!v2.empty());
+  global_int = 0;
+  v1();
+  BOOST_TEST(global_int == 5);
+  global_int = 0;
+  v2();
+  BOOST_TEST(global_int == 5);
+
+  // Construct a function given another function containing a function
+  func_void_type v3(v1);
+
+  // Invocation of a function
+  global_int = 0;
+  v3();
+  BOOST_TEST(global_int == 5);
+  
+  // clear() method
+  v3.clear();
+  BOOST_TEST(!v3);
+
+  // Assignment to an empty function
+  v3 = three;
+  BOOST_TEST(!v3.empty());
+
+  // Invocation
+  global_int = 0;
+  v3();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment to a non-empty function
+  v3 = five;
+
+  // Invocation
+  global_int = 0;
+  v3();
+  BOOST_TEST(global_int == 5);
+
+  // clear()
+  v3.clear();
+  BOOST_TEST(v3.empty());
+
+  // Assignment to an empty function from a free function
+  v3 = &write_five;
+  BOOST_TEST(!v3.empty());
+
+  // Invocation
+  global_int = 0;
+  v3();
+  BOOST_TEST(global_int == 5);
+
+  // Assignment to a non-empty function from a free function
+  v3 = &write_three;
+  BOOST_TEST(!v3.empty());
+
+  // Invocation
+  global_int = 0;
+  v3();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment
+  v3 = five;
+  BOOST_TEST(!v3.empty());
+
+  // Invocation
+  global_int = 0;
+  v3();
+  BOOST_TEST(global_int == 5);
+
+  // Construction of a function from a function containing a functor
+  func_void_type v4(v3);
+
+  // Invocation of a function
+  global_int = 0;
+  v4();
+  BOOST_TEST(global_int == 5);
+  
+  // clear() method
+  v4.clear();
+  BOOST_TEST(v4.empty());
+
+  // Assignment to an empty function
+  v4 = three;
+  BOOST_TEST(!v4.empty());
+
+  // Invocation
+  global_int = 0;
+  v4();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment to a non-empty function
+  v4 = five;
+
+  // Invocation
+  global_int = 0;
+  v4();
+  BOOST_TEST(global_int == 5);
+
+  // clear()
+  v4.clear();
+  BOOST_TEST(v4.empty());
+
+  // Assignment to an empty function from a free function
+  v4 = &write_five;
+  BOOST_TEST(!v4.empty());
+
+  // Invocation
+  global_int = 0;
+  v4();
+  BOOST_TEST(global_int == 5);
+
+  // Assignment to a non-empty function from a free function
+  v4 = &write_three;
+  BOOST_TEST(!v4.empty());
+
+  // Invocation
+  global_int = 0;
+  v4();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment
+  v4 = five;
+  BOOST_TEST(!v4.empty());
+
+  // Invocation
+  global_int = 0;
+  v4();
+  BOOST_TEST(global_int == 5);
+
+  // Construction of a function from a functor
+  func_void_type v5(five);
+
+  // Invocation of a function
+  global_int = 0;
+  v5();
+  BOOST_TEST(global_int == 5);
+  
+  // clear() method
+  v5.clear();
+  BOOST_TEST(v5.empty());
+
+  // Assignment to an empty function
+  v5 = three;
+  BOOST_TEST(!v5.empty());
+
+  // Invocation
+  global_int = 0;
+  v5();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment to a non-empty function
+  v5 = five;
+
+  // Invocation
+  global_int = 0;
+  v5();
+  BOOST_TEST(global_int == 5);
+
+  // clear()
+  v5.clear();
+  BOOST_TEST(v5.empty());
+
+  // Assignment to an empty function from a free function
+  v5 = &write_five;
+  BOOST_TEST(!v5.empty());
+
+  // Invocation
+  global_int = 0;
+  v5();
+  BOOST_TEST(global_int == 5);
+
+  // Assignment to a non-empty function from a free function
+  v5 = &write_three;
+  BOOST_TEST(!v5.empty());
+
+  // Invocation
+  global_int = 0;
+  v5();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment
+  v5 = five;
+  BOOST_TEST(!v5.empty());
+
+  // Invocation
+  global_int = 0;
+  v5();
+  BOOST_TEST(global_int == 5);  
+
+  // Construction of a function from a function
+  func_void_type v6(&write_five);
+
+  // Invocation of a function
+  global_int = 0;
+  v6();
+  BOOST_TEST(global_int == 5);
+
+  // clear() method
+  v6.clear();
+  BOOST_TEST(v6.empty());
+
+  // Assignment to an empty function
+  v6 = three;
+  BOOST_TEST(!v6.empty());
+
+  // Invocation
+  global_int = 0;
+  v6();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment to a non-empty function
+  v6 = five;
+
+  // Invocation
+  global_int = 0;
+  v6();
+  BOOST_TEST(global_int == 5);
+
+  // clear()
+  v6.clear();
+  BOOST_TEST(v6.empty());
+
+  // Assignment to an empty function from a free function
+  v6 = &write_five;
+  BOOST_TEST(!v6.empty());
+
+  // Invocation
+  global_int = 0;
+  v6();
+  BOOST_TEST(global_int == 5);
+
+  // Assignment to a non-empty function from a free function
+  v6 = &write_three;
+  BOOST_TEST(!v6.empty());
+
+  // Invocation
+  global_int = 0;
+  v6();
+  BOOST_TEST(global_int == 3);
+
+  // Assignment
+  v6 = five;
+  BOOST_TEST(!v6.empty());
+
+  // Invocation
+  global_int = 0;
+  v6();
+  BOOST_TEST(global_int == 5);  
+
+  // Const vs. non-const
+  write_const_1_nonconst_2 one_or_two;
+  const function<void> v7(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 return values
+  typedef function<int> func_int_type;
+  generate_five_obj gen_five;
+  generate_three_obj gen_three;
+
+  func_int_type i0(gen_five);
+
+  BOOST_TEST(i0() == 5);
+  i0 = gen_three;
+  BOOST_TEST(i0() == 3);
+  i0 = &generate_five;
+  BOOST_TEST(i0() == 5);
+  i0 = &generate_three;
+  BOOST_TEST(i0() == 3);
+  BOOST_TEST(i0);
+  i0.clear();
+  BOOST_TEST(!i0);
+
+  // Test return values with compatible types
+  typedef function<long> func_long_type;
+  func_long_type i1(gen_five);
+
+  BOOST_TEST(i1() == 5);
+  i1 = gen_three;
+  BOOST_TEST(i1() == 3);
+  i1 = &generate_five;
+  BOOST_TEST(i1() == 5);
+  i1 = &generate_three;
+  BOOST_TEST(i1() == 3);
+  BOOST_TEST(i1);
+  i1.clear();
+  BOOST_TEST(!i1);
+}
+
+static void
+test_one_arg()
+{
+  negate<int> neg;
+
+  function<int, int> f1(neg);
+  BOOST_TEST(f1(5) == -5);
+
+  function<string, string> id(&identity_str);
+  BOOST_TEST(id("str") == "str");
+
+  function<std::string, const char*> id2(&identity_str);
+  BOOST_TEST(id2("foo") == "foo");
+
+  add_to_obj add_to(5);
+  function<int, int> f2(add_to);
+  BOOST_TEST(f2(3) == 8);
+
+  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);
+  BOOST_TEST(cat("str", "ing") == "string");  
+
+  function<int, short, short> sum(&sum_ints);
+  BOOST_TEST(sum(2, 3) == 5);
+}
+
+static void
+test_emptiness()
+{
+  function<float> f1;
+  BOOST_TEST(f1.empty());
+
+  function<float> f2;
+  f2 = f1;
+  BOOST_TEST(f2.empty());
+
+  function<double> f3;
+  f3 = f2;
+  BOOST_TEST(f3.empty());
+}
+
+struct X {
+  X(int v) : value(v) {}
+
+  int twice() const { return 2*value; }
+  int plus(int v) { return value + v; }
+
+  int value;
+};
+
+static void
+test_member_functions()
+{
+  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;
+  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_TEST(f2(one, 3) == 4);
+  BOOST_TEST(f2(five, 4) == 9);
+}
+
+struct add_with_throw_on_copy {
+  int operator()(int x, int y) const { return x+y; }
+
+  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");
+  }
+
+  add_with_throw_on_copy& operator=(const add_with_throw_on_copy&)
+  {
+    throw std::runtime_error("But this CAN'T throw");
+  }
+};
+
+static void
+test_ref()
+{
+  add_with_throw_on_copy atc;
+  try {
+    boost::function<int, int, int> f(ref(atc));
+    BOOST_TEST(f(1, 3) == 4);
+  }
+  catch(std::runtime_error e) {
+    BOOST_ERROR("Nonthrowing constructor threw an exception");
+  }
+}
+
+int test_main(int, char* [])
+{
+  test_zero_args();
+  test_one_arg();
+  test_two_args();
+  test_emptiness();
+  test_member_functions();
+  test_ref();
+
+  return 0;
+}

test/function_n_test.cpp

@@ -93,7 +93,7 @@ test_zero_args()
 
   // Invocation and self-assignment
   global_int = 0;
-  v1.set(v1);
+  v1 = (v1);
   v1();
   BOOST_TEST(global_int == 5);
 
@@ -102,7 +102,7 @@ test_zero_args()
   BOOST_TEST(v1.empty());
 
   // Assignment to an empty function from a free function
-  v1 = &write_five;
+  v1 = write_five;
   BOOST_TEST(!v1.empty());
 
   // Invocation
@@ -129,7 +129,7 @@ test_zero_args()
   BOOST_TEST(global_int == 5);
 
   // Assignment to a non-empty function from a free function
-  v1 = &write_three;
+  v1 = write_three;
   BOOST_TEST(!v1.empty());
 
   // Invocation
@@ -152,7 +152,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,7 +163,7 @@ 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);
 
   // Invocation
@@ -584,6 +584,7 @@ struct X {
 static void
 test_member_functions()
 {
+
   boost::function1<int, X*> f1(&X::twice);
   
   X one(1);
@@ -603,13 +604,42 @@ test_member_functions()
   BOOST_TEST(f2(five, 4) == 9);
 }
 
-int
-test_main(int, char* [])
+struct add_with_throw_on_copy {
+  int operator()(int x, int y) const { return x+y; }
+
+  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");
+  }
+
+  add_with_throw_on_copy& operator=(const add_with_throw_on_copy&)
+  {
+    throw std::runtime_error("But this CAN'T throw");
+  }
+};
+
+static void
+test_ref()
+{
+  add_with_throw_on_copy atc;
+  try {
+    boost::function2<int, int, int> f(ref(atc));
+    BOOST_TEST(f(1, 3) == 4);
+  }
+  catch(std::runtime_error e) {
+    BOOST_ERROR("Nonthrowing constructor threw an exception");
+  }
+}
+
+int test_main(int, char* [])
 {
   test_zero_args();
   test_one_arg();
   test_two_args();
   test_emptiness();
   test_member_functions();
+  test_ref();
   return 0;
 }

test/function_test.cpp

@@ -14,6 +14,7 @@
 // For more information, see http://www.boost.org
 
 #define BOOST_INCLUDE_MAIN
+#define BOOST_FUNCTION_NO_DEPRECATED
 #include <boost/test/test_tools.hpp>
 #include <boost/function.hpp>
 #include <functional>
@@ -21,8 +22,7 @@
 #include <string>
 
 using namespace boost;
-using std::string;
-using std::negate;
+using namespace std;
 
 int global_int;
 
@@ -56,7 +56,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;
@@ -93,7 +93,7 @@ test_zero_args()
 
   // Invocation and self-assignment
   global_int = 0;
-  v1.set(v1);
+  v1 = (v1);
   v1();
   BOOST_TEST(global_int == 5);
 
@@ -102,7 +102,7 @@ test_zero_args()
   BOOST_TEST(v1.empty());
 
   // Assignment to an empty function from a free function
-  v1 = &write_five;
+  v1 = BOOST_FUNCTION_TARGET_FIX(&) write_five;
   BOOST_TEST(!v1.empty());
 
   // Invocation
@@ -111,7 +111,7 @@ test_zero_args()
   BOOST_TEST(global_int == 5);
 
   // Assignment to a non-empty function from a free function
-  v1 = &write_three;
+  v1 = BOOST_FUNCTION_TARGET_FIX(&) write_three;
   BOOST_TEST(!v1.empty());
 
   // Invocation
@@ -152,7 +152,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,7 +163,7 @@ test_zero_args()
   BOOST_TEST(v2.empty());
 
   // Assignment to an empty function from a free function
-  v2.set(&write_five);
+  v2 = (BOOST_FUNCTION_TARGET_FIX(&) write_five);
   BOOST_TEST(v2);
 
   // Invocation
@@ -172,7 +172,7 @@ test_zero_args()
   BOOST_TEST(global_int == 5);
 
   // Assignment to a non-empty function from a free function
-  v2 = &write_three;
+  v2 = BOOST_FUNCTION_TARGET_FIX(&) write_three;
   BOOST_TEST(!v2.empty());
 
   // Invocation
@@ -227,7 +227,7 @@ test_zero_args()
   BOOST_TEST(global_int == 3);
 
   // Assign to a function from a function with a function
-  v2 = &write_five;
+  v2 = BOOST_FUNCTION_TARGET_FIX(&) write_five;
   v1 = v2;
   BOOST_TEST(!v1.empty());
   BOOST_TEST(!v2.empty());
@@ -480,8 +480,8 @@ test_zero_args()
 
   // Const vs. non-const
   write_const_1_nonconst_2 one_or_two;
-  const function<void> v7(one_or_two);
-  function <void> v8(one_or_two);
+  const function<void ()> v7(one_or_two);
+  function<void ()> v8(one_or_two);
 
   global_int = 0;
   v7();
@@ -492,7 +492,7 @@ test_zero_args()
   BOOST_TEST(global_int == 2);
 
   // 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;
 
@@ -510,7 +510,7 @@ test_zero_args()
   BOOST_TEST(!i0);
 
   // 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);
@@ -530,44 +530,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");  
 
-  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,7 +584,7 @@ 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);
@@ -592,24 +592,119 @@ test_member_functions()
   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);
 }
 
-int
-test_main(int, char* [])
+struct add_with_throw_on_copy {
+  int operator()(int x, int y) const { return x+y; }
+
+  add_with_throw_on_copy() {}
+
+  add_with_throw_on_copy(const add_with_throw_on_copy&)
+  {
+    throw runtime_error("But this CAN'T throw");
+  }
+
+  add_with_throw_on_copy& operator=(const add_with_throw_on_copy&)
+  {
+    throw runtime_error("But this CAN'T throw");
+  }
+};
+
+static void
+test_ref()
+{
+  add_with_throw_on_copy atc;
+  try {
+    boost::function<int (int, int)> f(ref(atc));
+    BOOST_TEST(f(1, 3) == 4);
+  }
+  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
+}
+
+int test_main(int, char* [])
 {
   test_zero_args();
   test_one_arg();
   test_two_args();
   test_emptiness();
   test_member_functions();
+  test_ref();
+  test_allocator();
+
   return 0;
 }

test/mixin_test.cpp

@@ -20,7 +20,7 @@
 #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;}
@@ -49,12 +49,12 @@ int test_main(int, char*[])
 
   f.id = 21;    
   BOOST_TEST(f.id == 21);
-	  
+          
   boost::swap(f,g);  
   BOOST_TEST(f.id == 7);
   BOOST_TEST(g.id == 21);
 
-  g = f;	  
+  g = f;          
   BOOST_TEST(g.id == 7);  
   return 0;
 }

test/regression.cfg

@@ -11,4 +11,4 @@ compile-fail libs/function/test/function_test_fail1.cpp
 compile-fail libs/function/test/function_test_fail2.cpp
 run libs/function/test/mixin_test.cpp
 run libs/function/test/policy_test.cpp
-
+run libs/function/test/stateless_test.cpp

test/stateless_test.cpp

@@ -0,0 +1,47 @@
+// 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 <boost/function.hpp>
+#include <stdexcept>
+
+struct stateless_integer_add {
+  int operator()(int x, int y) const { return x+y; }
+
+  void* operator new(std::size_t, stateless_integer_add*)
+  {
+    throw std::runtime_error("Cannot allocate a stateless_integer_add");
+  }
+
+  void operator delete(void*, stateless_integer_add*)
+  {
+  }
+};
+
+namespace boost {
+  template<>
+  struct is_stateless<stateless_integer_add> {
+    BOOST_STATIC_CONSTANT(bool, value = true);
+  };
+}
+
+int test_main(int, char*[])
+{
+  boost::function<int, int, int> f;
+  f = stateless_integer_add();
+
+  return 0;
+}