Release 1.43.0 beta 1

[SVN r61461]

bind.html

@@ -61,7 +61,6 @@
 				bind&lt;R&gt;(f, ...)</A></h4>
 		<h4 style="MARGIN-LEFT: 40pt"><A href="#err_nonstd">Binding a nonstandard function</A></h4>
 		<h4 style="MARGIN-LEFT: 40pt"><A href="#err_overloaded">Binding an overloaded function</A></h4>
-		<h4 style="MARGIN-LEFT: 40pt"><A href="#err_modeling_stl_function_object_concepts">Modeling STL function object concepts</A></h4>
 		<h4 style="MARGIN-LEFT: 40pt"><A href="#err_const_arg"><b>const</b> in signatures</A></h4>
 		<h4 style="MARGIN-LEFT: 40pt"><A href="#err_msvc_using">MSVC specific: using 
 				boost::bind;</A></h4>
@@ -147,8 +146,8 @@ bind(g, _1, _1, _1)(x, y, z);          // g(x, x, x)
 
 bind(f, i, _1);
 </pre>
-		<p>a copy of the value of <b>i</b> is stored into the function object. <A href="../core/doc/html/core/ref.html">
-				boost::ref</A> and <A href="../core/doc/html/core/ref.html">boost::cref</A> can be used to make 
+		<p>a copy of the value of <b>i</b> is stored into the function object. <A href="ref.html">
+				boost::ref</A> and <A href="ref.html">boost::cref</A> can be used to make 
 			the function object store a reference to an object, rather than a copy:
 		</p>
 		<pre>int i = 5;
@@ -272,7 +271,7 @@ bind(&amp;X::f, p, _1)(i);			// (<i>internal copy of p</i>)-&gt;f(i)
 		</p>
 		<P>This feature of <b>bind</b> can be used to perform function composition. See <A href="bind_as_compose.cpp">
 				bind_as_compose.cpp</A> for an example that demonstrates how to use <b>bind</b>
-			to achieve similar functionality to <A href="http://www.boost.org/doc/libs/1_31_0/libs/compose/index.htm">Boost.Compose</A>.
+			to achieve similar functionality to <A href="../compose/index.htm">Boost.Compose</A>.
 		</P>
 		<p>Note that the first argument - the bound function object - is not evaluated, 
 			even when it's a function object that is produced by <STRONG>bind</STRONG> or a 
@@ -390,7 +389,7 @@ void connect()
 		<p>As a general rule, the function objects generated by <b>bind</b> take their 
 			arguments by reference and cannot, therefore, accept non-const temporaries or 
 			literal constants. This is an inherent limitation of the C++ language in its 
-			current (2003) incarnation, known as <A href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm">
+			current (2003) incarnation, known as <A href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1385.htm">
 				the forwarding problem</A>. (It will be fixed in the next standard, usually 
 			called C++0x.)</p>
 		<p>The library uses signatures of the form
@@ -586,48 +585,6 @@ int main()
     boost::bind( get, _1 );
 }
 </pre>
-		<h3><a name="err_modeling_stl_function_object_concepts">Modeling STL function object concepts</a></h3>
-		<p>The function objects that are produced by <b>boost::bind</b> do not model the
-		STL <a href="http://www.sgi.com/tech/stl/UnaryFunction.html">Unary Function</a> or
-		<a href="http://www.sgi.com/tech/stl/BinaryFunction.html">Binary Function</a> concepts,
-		even when the function objects are unary or binary operations, because the function object
-		types are missing public typedefs <tt>result_type</tt> and <tt>argument_type</tt> or
-		<tt>first_argument_type</tt> and <tt>second_argument_type</tt>. In cases where these
-		typedefs are desirable, however, the utility function <tt>make_adaptable</tt>
-		can be used to adapt unary and binary function objects to these concepts. This allows
-		unary and binary function objects resulting from <b>boost::bind</b> to be combined with
-		STL templates such as <a href="http://msdn.microsoft.com/en-us/library/se0409db%28v=VS.90%29.aspx"><tt>std::unary_negate</tt></a>
-		and <a href="http://msdn.microsoft.com/en-us/library/833073z4%28v=VS.90%29.aspx"><tt>std::binary_negate</tt></a>.</p>
-		
-		<p>The <tt>make_adaptable</tt> function is defined in &lt;<a href="../../boost/bind/make_adaptable.hpp">boost/bind/make_adaptable.hpp</a>&gt;,
-		which must be included explicitly in addition to &lt;boost/bind.hpp&gt;:</p>
-		<pre>
-#include &lt;boost/bind/make_adaptable.hpp&gt;
-
-template &lt;class R, class F&gt; <i>unspecified-type</i> make_adaptable(F f);
-
-template&lt;class R, class A1, class F&gt; <i>unspecified-unary-functional-type</i> make_adaptable(F f);
-
-template&lt;class R, class A1, class A2, class F&gt; <i>unspecified-binary-functional-type</i> make_adaptable(F f);
-
-template&lt;class R, class A1, class A2, class A3, class F&gt; <i>unspecified-ternary-functional-type</i> make_adaptable(F f);
-
-template&lt;class R, class A1, class A2, class A3, class A4, class F&gt; <i>unspecified-4-ary-functional-type</i> make_adaptable(F f);
-		</pre>
-		
-		<p>This example shows how to use <tt>make_adaptable</tt> to make a predicate for "is not a space":</p>
-		<pre>typedef char char_t;
-std::locale loc("");
-const std::ctype&lt;char_t&gt;&amp; ct = std::use_facet&lt;std::ctype&lt;char_t&gt; &gt;(loc);
-
-auto isntspace = std::not1( boost::make_adaptable&lt;bool, char_t&gt;( boost::bind(&amp;std::ctype&lt;char_t&gt;::is, &amp;ct, std::ctype_base::space, _1) ) );
-</pre>
-
-		<p>In this example, <b>boost::bind</b> creates the "is a space" (unary) predicate.
-		It is then passed to <tt>make_adaptable</tt> so that a function object modeling
-		the Unary Function concept can be created, serving as the argument to
-		<a href="http://msdn.microsoft.com/en-us/library/syyszzf8%28v=VS.90%29.aspx"><tt>std::not1</tt></a>.</p>
-		
 		<h3><a name="err_const_arg"><b>const</b> in signatures</a></h3>
 		<p>Some compilers, including MSVC 6.0 and Borland C++ 5.5.1, have problems with the 
 			top-level <b>const</b> in function signatures:
@@ -737,7 +694,7 @@ namespace
 			a nonnegative integer, is defined as:</p>
 		<ul>
 			<li>
-				<tt>x.get()</tt>, when <tt>x</tt> is of type <tt><A href="../core/doc/html/core/ref.html">boost::reference_wrapper</A>&lt;T&gt;</tt>
+				<tt>x.get()</tt>, when <tt>x</tt> is of type <tt><A href="ref.html">boost::reference_wrapper</A>&lt;T&gt;</tt>
 				for some type <tt>T</tt>;
 			<li>
 				v<sub>k</sub>, when <tt>x</tt>
@@ -912,7 +869,7 @@ namespace
 			<li>
 				<A href="../config/config.htm">Boost.Config</A>
 			<li>
-				<A href="../core/doc/html/core/ref.html">boost/ref.hpp</A>
+				<A href="ref.html">boost/ref.hpp</A>
 			<li>
 				<A href="mem_fn.html">boost/mem_fn.hpp</A>
 			<li>

doc/Jamfile.v2

@@ -0,0 +1,13 @@
+#   Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
+  
+#   Distributed under the Boost Software License, Version 1.0.
+#   (See accompanying file LICENSE_1_0.txt or copy at
+#   http://www.boost.org/LICENSE_1_0.txt)
+project boost/doc ;
+import boostbook : boostbook ;
+
+boostbook ref-doc : ref.xml 
+	:
+        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
+	;
+

doc/ref.xml

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

include/boost/bind/arg.hpp

@@ -21,7 +21,6 @@
 
 #include <boost/config.hpp>
 #include <boost/is_placeholder.hpp>
-#include <boost/static_assert.hpp>
 
 namespace boost
 {
@@ -34,7 +33,8 @@ template< int I > struct arg
 
     template< class T > arg( T const & /* t */ )
     {
-        BOOST_STATIC_ASSERT( I == is_placeholder<T>::value );
+        // static assert I == is_placeholder<T>::value
+        typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
     }
 };
 

include/boost/bind/bind.hpp

@@ -1680,7 +1680,7 @@ template< class R, class T > struct add_cref< R (T::*) (), 1 >
     typedef void type;
 };
 
-#if !defined(__IBMCPP__) || __IBMCPP_FUNC_CV_TMPL_ARG_DEDUCTION
+#if !( defined(__IBMCPP__) && BOOST_WORKAROUND( __IBMCPP__, BOOST_TESTED_AT(600) ) )
 
 template< class R, class T > struct add_cref< R (T::*) () const, 1 >
 {

include/boost/bind/placeholders.hpp

@@ -25,7 +25,7 @@
 namespace
 {
 
-#if defined(__BORLANDC__) || defined(__GNUC__) && (__GNUC__ < 4)
+#if defined(__BORLANDC__) || defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 400)
 
 static inline boost::arg<1> _1() { return boost::arg<1>(); }
 static inline boost::arg<2> _2() { return boost::arg<2>(); }
@@ -38,7 +38,7 @@ static inline boost::arg<8> _8() { return boost::arg<8>(); }
 static inline boost::arg<9> _9() { return boost::arg<9>(); }
 
 #elif defined(BOOST_MSVC) || (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031) || defined(__MWERKS__) || \
-    defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 2)  
+    defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 400)  
 
 static boost::arg<1> _1;
 static boost::arg<2> _2;

mem_fn.html

@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 	<head>
 		<title>Boost: mem_fn.hpp documentation</title>
@@ -145,7 +146,7 @@ void k(std::vector&lt;boost::shared_ptr&lt;X&gt; &gt; const &amp; v)
 		<p>
 			Yes. For simple uses, <b>mem_fn</b> provides additional functionality that the 
 			standard adaptors do not. Complicated expressions that use <b>std::bind1st</b>, <b>std::bind2nd</b>
-			or <a href="http://www.boost.org/doc/libs/1_31_0/libs/compose/index.htm"><b>Boost.Compose</b></a> along with the 
+			or <a href="../compose/index.htm"><b>Boost.Compose</b></a> along with the 
 			standard adaptors can be rewritten using <a href="bind.html"><b>boost::bind</b></a>
 			that automatically takes advantage of <b>mem_fn</b>.
 		</p>

meta/libraries.json

@@ -1,34 +0,0 @@
-[
-    {
-        "key": "bind",
-        "name": "Bind",
-        "authors": [
-            "Peter Dimov"
-        ],
-        "description": "boost::bind is a generalization of the standard functions std::bind1st and std::bind2nd. It supports arbitrary function objects, functions, function pointers, and member function pointers, and is able to bind any argument to a specific value or route input arguments into arbitrary positions.",
-        "std": [
-            "tr1"
-        ],
-        "category": [
-            "Function-objects"
-        ],
-        "maintainers": [
-            "Peter Dimov <pdimov -at- pdimov.com>"
-        ]
-    },
-    {
-        "key": "bind/mem_fn",
-        "name": "Member Function",
-        "authors": [
-            "Peter Dimov"
-        ],
-        "description": "Generalized binders for function/object/pointers and member functions.",
-        "documentation": "mem_fn.html",
-        "std": [
-            "tr1"
-        ],
-        "category": [
-            "Function-objects"
-        ]
-    }
-]

ref.html

@@ -0,0 +1,15 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0; URL=../../doc/html/ref.html">
+</head>
+<body>
+Automatic redirection failed, please go to
+<a href="../../doc/html/ref.html">../../doc/html/ref.html</a>
+</body>
+</html>
+<!--
+	© Copyright Beman Dawes, 2001
+	Distributed under the Boost Software License, Version 1.0.
+	See accompanying file LICENSE_1_0.txt or copy at
+	http://www.boost.org/LICENSE_1_0.txt
+-->

test/bind_cv_test.cpp

@@ -33,12 +33,6 @@
 
 struct X
 {
-    // SGI-related compilers have odd compiler-synthesized ctors dtors
-    #ifdef __PATHSCALE__
-    X() {}
-    ~X() {}
-    #endif
-
     int operator()()
     {
         return 17041;

test/bind_stateful_test.cpp

@@ -43,11 +43,6 @@ public:
     {
     }
 
-    // SGI-related compilers have odd compiler-synthesized ctors and dtors
-    #ifdef __PATHSCALE__
-    ~X() {}
-    #endif
-
     int state() const
     {
         return state_;

test/mem_fn_eq_test.cpp

@@ -39,128 +39,128 @@ struct X
     // 0
 
     int mf0_1() { return 0; }
-    int mf0_2() { return 1; }
+    int mf0_2() { return 0; }
 
     int cmf0_1() const { return 0; }
-    int cmf0_2() const { return 1; }
+    int cmf0_2() const { return 0; }
 
     void mf0v_1() {}
-    void mf0v_2() { static int x; ++x; }
+    void mf0v_2() {}
 
     void cmf0v_1() const {}
-    void cmf0v_2() const { static int x; ++x; }
+    void cmf0v_2() const {}
 
     // 1
 
     int mf1_1(int) { return 0; }
-    int mf1_2(int) { return 1; }
+    int mf1_2(int) { return 0; }
 
     int cmf1_1(int) const { return 0; }
-    int cmf1_2(int) const { return 1; }
+    int cmf1_2(int) const { return 0; }
 
     void mf1v_1(int) {}
-    void mf1v_2(int) { static int x; ++x; }
+    void mf1v_2(int) {}
 
     void cmf1v_1(int) const {}
-    void cmf1v_2(int) const { static int x; ++x; }
+    void cmf1v_2(int) const {}
 
     // 2
 
     int mf2_1(int, int) { return 0; }
-    int mf2_2(int, int) { return 1; }
+    int mf2_2(int, int) { return 0; }
 
     int cmf2_1(int, int) const { return 0; }
-    int cmf2_2(int, int) const { return 1; }
+    int cmf2_2(int, int) const { return 0; }
 
     void mf2v_1(int, int) {}
-    void mf2v_2(int, int) { static int x; ++x; }
+    void mf2v_2(int, int) {}
 
     void cmf2v_1(int, int) const {}
-    void cmf2v_2(int, int) const { static int x; ++x; }
+    void cmf2v_2(int, int) const {}
 
     // 3
 
     int mf3_1(int, int, int) { return 0; }
-    int mf3_2(int, int, int) { return 1; }
+    int mf3_2(int, int, int) { return 0; }
 
     int cmf3_1(int, int, int) const { return 0; }
-    int cmf3_2(int, int, int) const { return 1; }
+    int cmf3_2(int, int, int) const { return 0; }
 
     void mf3v_1(int, int, int) {}
-    void mf3v_2(int, int, int) { static int x; ++x; }
+    void mf3v_2(int, int, int) {}
 
     void cmf3v_1(int, int, int) const {}
-    void cmf3v_2(int, int, int) const { static int x; ++x; }
+    void cmf3v_2(int, int, int) const {}
 
     // 4
 
     int mf4_1(int, int, int, int) { return 0; }
-    int mf4_2(int, int, int, int) { return 1; }
+    int mf4_2(int, int, int, int) { return 0; }
 
     int cmf4_1(int, int, int, int) const { return 0; }
-    int cmf4_2(int, int, int, int) const { return 1; }
+    int cmf4_2(int, int, int, int) const { return 0; }
 
     void mf4v_1(int, int, int, int) {}
-    void mf4v_2(int, int, int, int) { static int x; ++x; }
+    void mf4v_2(int, int, int, int) {}
 
     void cmf4v_1(int, int, int, int) const {}
-    void cmf4v_2(int, int, int, int) const { static int x; ++x; }
+    void cmf4v_2(int, int, int, int) const {}
 
     // 5
 
     int mf5_1(int, int, int, int, int) { return 0; }
-    int mf5_2(int, int, int, int, int) { return 1; }
+    int mf5_2(int, int, int, int, int) { return 0; }
 
     int cmf5_1(int, int, int, int, int) const { return 0; }
-    int cmf5_2(int, int, int, int, int) const { return 1; }
+    int cmf5_2(int, int, int, int, int) const { return 0; }
 
     void mf5v_1(int, int, int, int, int) {}
-    void mf5v_2(int, int, int, int, int) { static int x; ++x; }
+    void mf5v_2(int, int, int, int, int) {}
 
     void cmf5v_1(int, int, int, int, int) const {}
-    void cmf5v_2(int, int, int, int, int) const { static int x; ++x; }
+    void cmf5v_2(int, int, int, int, int) const {}
 
     // 6
 
     int mf6_1(int, int, int, int, int, int) { return 0; }
-    int mf6_2(int, int, int, int, int, int) { return 1; }
+    int mf6_2(int, int, int, int, int, int) { return 0; }
 
     int cmf6_1(int, int, int, int, int, int) const { return 0; }
-    int cmf6_2(int, int, int, int, int, int) const { return 1; }
+    int cmf6_2(int, int, int, int, int, int) const { return 0; }
 
     void mf6v_1(int, int, int, int, int, int) {}
-    void mf6v_2(int, int, int, int, int, int) { static int x; ++x; }
+    void mf6v_2(int, int, int, int, int, int) {}
 
     void cmf6v_1(int, int, int, int, int, int) const {}
-    void cmf6v_2(int, int, int, int, int, int) const { static int x; ++x; }
+    void cmf6v_2(int, int, int, int, int, int) const {}
 
     // 7
 
     int mf7_1(int, int, int, int, int, int, int) { return 0; }
-    int mf7_2(int, int, int, int, int, int, int) { return 1; }
+    int mf7_2(int, int, int, int, int, int, int) { return 0; }
 
     int cmf7_1(int, int, int, int, int, int, int) const { return 0; }
-    int cmf7_2(int, int, int, int, int, int, int) const { return 1; }
+    int cmf7_2(int, int, int, int, int, int, int) const { return 0; }
 
     void mf7v_1(int, int, int, int, int, int, int) {}
-    void mf7v_2(int, int, int, int, int, int, int) { static int x; ++x; }
+    void mf7v_2(int, int, int, int, int, int, int) {}
 
     void cmf7v_1(int, int, int, int, int, int, int) const {}
-    void cmf7v_2(int, int, int, int, int, int, int) const { static int x; ++x; }
+    void cmf7v_2(int, int, int, int, int, int, int) const {}
 
     // 8
 
     int mf8_1(int, int, int, int, int, int, int, int) { return 0; }
-    int mf8_2(int, int, int, int, int, int, int, int) { return 1; }
+    int mf8_2(int, int, int, int, int, int, int, int) { return 0; }
 
     int cmf8_1(int, int, int, int, int, int, int, int) const { return 0; }
-    int cmf8_2(int, int, int, int, int, int, int, int) const { return 1; }
+    int cmf8_2(int, int, int, int, int, int, int, int) const { return 0; }
 
     void mf8v_1(int, int, int, int, int, int, int, int) {}
-    void mf8v_2(int, int, int, int, int, int, int, int) { static int x; ++x; }
+    void mf8v_2(int, int, int, int, int, int, int, int) {}
 
     void cmf8v_1(int, int, int, int, int, int, int, int) const {}
-    void cmf8v_2(int, int, int, int, int, int, int, int) const { static int x; ++x; }
+    void cmf8v_2(int, int, int, int, int, int, int, int) const {}
 
 };