This commit was manufactured by cvs2svn to create tag 'minmax'.

[SVN r22393]

doc/function.xml

@@ -8,14 +8,13 @@
   <author>
     <firstname>Douglas</firstname>
     <surname>Gregor</surname>
-    <email>dgregor -at- cs.indiana.edu</email>
+     <email>gregod@cs.rpi.edu</email>
   </author>
 
   <copyright>
     <year>2001</year>
     <year>2002</year>
     <year>2003</year>
-    <year>2004</year>
     <holder>Douglas Gregor</holder>
   </copyright>
 

doc/reference.xml

@@ -106,18 +106,6 @@
 
         <throws><simpara>Will not throw.</simpara></throws>
       </overloaded-method>
-
-      <method name="contains" cv="const">
-        <template>
-          <template-type-parameter name="Functor"/>
-        </template>
-        <type>bool</type>
-        <parameter name="f">
-          <paramtype>const Functor&amp;</paramtype>
-        </parameter>
-        <returns><simpara><code>true</code> if <code>this-&gt;<methodname>target</methodname>&lt;Functor&gt;()</code> is non-NULL and <code><functionname>function_equal</functionname>(*(this-&gt;target&lt;Functor&gt;()), f)</code></simpara></returns>
- 
-      </method>
     </method-group>
   </class>
 
@@ -274,18 +262,6 @@
 
         <throws><simpara>Will not throw.</simpara></throws>
       </overloaded-method>
-
-      <method name="contains" cv="const">
-        <template>
-          <template-type-parameter name="Functor"/>
-        </template>
-        <type>bool</type>
-        <parameter name="f">
-          <paramtype>const Functor&amp;</paramtype>
-        </parameter>
-        <returns><simpara><code>true</code> if <code>this-&gt;<methodname>target</methodname>&lt;Functor&gt;()</code> is non-NULL and <code><functionname>function_equal</functionname>(*(this-&gt;target&lt;Functor&gt;()), f)</code></simpara></returns>
- 
-      </method>
     </method-group>
 
     <method-group name="invocation">
@@ -401,9 +377,8 @@
 
             <listitem><simpara><code>g</code> is not of type
             <code><classname>reference_wrapper</classname>&lt;Functor&gt;</code>
-            and
-            <code><functionname>function_equal</functionname>(*(f.target&lt;Functor&gt;()),
-            g)</code>.</simpara></listitem>
+            and <code>*(f.target&lt;Functor&gt;()) ==
+            g</code>.</simpara></listitem>
 
           </itemizedlist>
           </simpara></returns>
@@ -504,7 +479,8 @@
 
             <listitem><simpara><code>g</code> is not of type
             <code><classname>reference_wrapper</classname>&lt;Functor&gt;</code>
-            and <code>!<functionname>function_equal</functionname>(*(f.target&lt;Functor&gt;()), g)</code>.</simpara></listitem>
+            and <code>*(f.target&lt;Functor&gt;()) !=
+            g</code>.</simpara></listitem>
 
           </itemizedlist>
           </simpara></returns>
@@ -696,18 +672,6 @@
         pointer.</simpara></returns>
         <throws><simpara>Will not throw.</simpara></throws>
       </overloaded-method>
-
-      <method name="contains" cv="const">
-        <template>
-          <template-type-parameter name="Functor"/>
-        </template>
-        <type>bool</type>
-        <parameter name="f">
-          <paramtype>const Functor&amp;</paramtype>
-        </parameter>
-        <returns><simpara><code>true</code> if <code>this-&gt;<methodname>target</methodname>&lt;Functor&gt;()</code> is non-NULL and <code><functionname>function_equal</functionname>(*(this-&gt;target&lt;Functor&gt;()), f)</code></simpara></returns>
- 
-      </method>
     </method-group>
 
     <method-group name="invocation">
@@ -802,7 +766,8 @@
 
             <listitem><simpara><code>g</code> is not of type
             <code><classname>reference_wrapper</classname>&lt;Functor&gt;</code>
-            and <code><functionname>function_equals</functionname>(*(f.target&lt;Functor&gt;()), g)</code>.</simpara></listitem>
+            and <code>*(f.target&lt;Functor&gt;()) ==
+            g</code>.</simpara></listitem>
 
           </itemizedlist>
           </simpara></returns>
@@ -885,7 +850,8 @@
 
             <listitem><simpara><code>g</code> is not of type
             <code><classname>reference_wrapper</classname>&lt;Functor&gt;</code>
-            and <code>!<functionname>function_equals</functionname>(*(f.target&lt;Functor&gt;()), g)</code>.</simpara></listitem>
+            and <code>*(f.target&lt;Functor&gt;()) !=
+            g</code>.</simpara></listitem>
 
           </itemizedlist>
           </simpara></returns>
@@ -905,25 +871,4 @@
   </class>
 </namespace>
 </header>
-
-<header name="boost/function_equal.hpp">
-  <namespace name="boost">
-  <function name="function_equal">
-    <template>
-      <template-type-parameter name="F"/>
-      <template-type-parameter name="G"/>
-    </template>
-    <type>bool</type>
-    <parameter name="f">
-      <paramtype>const F&amp;</paramtype>
-    </parameter>
-    <parameter name="g">
-      <paramtype>const G&amp;</paramtype>
-    </parameter>
-    <purpose><simpara>Compare two function objects for equality.</simpara></purpose>
-    <returns><simpara><code>f == g</code>.</simpara></returns>
-    <throws><simpara>Only if <code>f == g</code> throws.</simpara></throws>
-  </function>
-  </namespace>
-</header>
 </library-reference>

example/bind1st.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library examples
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

example/int_div.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library examples
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

example/sum_avg.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library examples
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/detail/function_iterate.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2003. Use, modification and
+//  Copyright Doug Gregor 2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/detail/gen_maybe_include.pl

@@ -2,7 +2,7 @@
 #
 # Boost.Function library
 #
-# Copyright (C) 2001-2003 Douglas Gregor (gregod@cs.rpi.edu)
+# Copyright (C) 2001-2003 Doug Gregor (gregod@cs.rpi.edu)
 #
 # Permission to copy, use, sell and distribute this software is granted
 # provided this copyright notice appears in all copies.

include/boost/function/detail/maybe_include.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2003. Use, modification and
+//  Copyright Doug Gregor 2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/detail/prologue.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function0.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function1.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function10.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function2.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function3.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function4.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function5.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function6.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function7.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function8.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function9.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

include/boost/function/function_base.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2001-2004. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -28,7 +28,6 @@
 #else
 #  include "boost/mpl/bool.hpp"
 #endif
-#include <boost/function_equal.hpp>
 
 // Borrowed from Boost.Python library: determines the cases where we
 // need to use std::type_info::name to compare instead of operator==.
@@ -63,12 +62,6 @@ namespace boost { namespace python { namespace objects {
 #  define BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX
 #endif
 
-#define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type)              \
-  typename ::boost::enable_if_c<(::boost::type_traits::ice_not<          \
-                        (::boost::is_integral<Functor>::value)>::value), \
-                       Type>::type
-
-
 #if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
 namespace boost {
 
@@ -343,7 +336,7 @@ namespace boost {
                       mpl::bool_<false>)
         {
           if (const Functor* fp = f.template target<Functor>())
-            return function_equal(*fp, g);
+            return *fp == g;
           else return false;
         }
 
@@ -363,7 +356,7 @@ namespace boost {
                           mpl::bool_<false>)
         {
           if (const Functor* fp = f.template target<Functor>())
-            return !function_equal(*fp, g);
+            return *fp != g;
           else return true;
         }
 
@@ -406,7 +399,7 @@ public:
       detail::function::any_pointer result =
         manager(detail::function::make_any_pointer(&typeid(Functor)),
                 detail::function::check_functor_type_tag);
-      if (!result.obj_ptr) return 0;
+      if (!result.obj_ptr) return false;
       else {
         typedef typename detail::function::get_function_tag<Functor>::type tag;
         return get_functor_pointer<Functor>(tag(), 0);
@@ -421,46 +414,13 @@ public:
       detail::function::any_pointer result =
         manager(detail::function::make_any_pointer(&typeid(Functor)),
                 detail::function::check_functor_type_tag);
-      if (!result.obj_ptr) return 0;
+      if (!result.obj_ptr) return false;
       else {
         typedef typename detail::function::get_function_tag<Functor>::type tag;
         return get_functor_pointer<Functor>(tag(), 0);
       }
     }
 
-  template<typename F>
-    bool contains(const F& f) const
-    {
-      if (const F* fp = this->template target<F>()) {
-        return function_equal(*fp, f);
-      } else {
-        return false;
-      }
-    }
-
-#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3
-  // GCC 3.3 and newer cannot copy with the global operator==, due to
-  // problems with instantiation of function return types before it
-  // has been verified that the argument types match up.
-  template<typename Functor>
-    BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-    operator==(Functor g) const
-    {
-      if (const Functor* fp = target<Functor>())
-        return function_equal(*fp, g);
-      else return false;
-    }
-
-  template<typename Functor>
-    BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-    operator!=(Functor g) const
-    {
-      if (const Functor* fp = target<Functor>())
-        return !function_equal(*fp, g);
-      else return true;
-    }
-#endif
-
 public: // should be protected, but GCC 2.95.3 will fail to allow access
   detail::function::any_pointer (*manager)(
     detail::function::any_pointer,
@@ -522,116 +482,6 @@ inline bool operator!=(detail::function::useless_clear_type*,
 }
 #endif
 
-#ifdef BOOST_NO_SFINAE
-// Comparisons between boost::function objects and arbitrary function objects
-template<typename Functor>
-  inline bool operator==(const function_base& f, Functor g)
-  {
-    typedef mpl::bool_<(is_integral<Functor>::value)> integral;
-    return detail::function::compare_equal(f, g, 0, integral());
-  }
-
-template<typename Functor>
-  inline bool operator==(Functor g, const function_base& f)
-  {
-    typedef mpl::bool_<(is_integral<Functor>::value)> integral;
-    return detail::function::compare_equal(f, g, 0, integral());
-  }
-
-template<typename Functor>
-  inline bool operator!=(const function_base& f, Functor g)
-  {
-    typedef mpl::bool_<(is_integral<Functor>::value)> integral;
-    return detail::function::compare_not_equal(f, g, 0, integral());
-  }
-
-template<typename Functor>
-  inline bool operator!=(Functor g, const function_base& f)
-  {
-    typedef mpl::bool_<(is_integral<Functor>::value)> integral;
-    return detail::function::compare_not_equal(f, g, 0, integral());
-  }
-#else
-
-#  if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
-// Comparisons between boost::function objects and arbitrary function
-// objects. GCC 3.3 and before has an obnoxious bug that prevents this
-// from working.
-template<typename Functor>
-  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-  operator==(const function_base& f, Functor g)
-  {
-    if (const Functor* fp = f.template target<Functor>())
-      return function_equal(*fp, g);
-    else return false;
-  }
-
-template<typename Functor>
-  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-  operator==(Functor g, const function_base& f)
-  {
-    if (const Functor* fp = f.template target<Functor>())
-      return function_equal(g, *fp);
-    else return false;
-  }
-
-template<typename Functor>
-  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-  operator!=(const function_base& f, Functor g)
-  {
-    if (const Functor* fp = f.template target<Functor>())
-      return !function_equal(*fp, g);
-    else return true;
-  }
-
-template<typename Functor>
-  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-  operator!=(Functor g, const function_base& f)
-  {
-    if (const Functor* fp = f.template target<Functor>())
-      return !function_equal(g, *fp);
-    else return true;
-  }
-#  endif
-
-template<typename Functor>
-  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-  operator==(const function_base& f, reference_wrapper<Functor> g)
-  {
-    if (const Functor* fp = f.template target<Functor>())
-      return fp == g.get_pointer();
-    else return false;
-  }
-
-template<typename Functor>
-  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-  operator==(reference_wrapper<Functor> g, const function_base& f)
-  {
-    if (const Functor* fp = f.template target<Functor>())
-      return g.get_pointer() == fp;
-    else return false;
-  }
-
-template<typename Functor>
-  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-  operator!=(const function_base& f, reference_wrapper<Functor> g)
-  {
-    if (const Functor* fp = f.template target<Functor>())
-      return fp != g.get_pointer();
-    else return true;
-  }
-
-template<typename Functor>
-  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-  operator!=(reference_wrapper<Functor> g, const function_base& f)
-  {
-    if (const Functor* fp = f.template target<Functor>())
-      return g.get_pointer() != fp;
-    else return true;
-  }
-
-#endif // Compiler supporting SFINAE
-
 namespace detail {
   namespace function {
     inline bool has_empty_target(const function_base* f)
@@ -654,7 +504,6 @@ namespace detail {
 } // end namespace detail
 } // end namespace boost
 
-#undef BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL
 #undef BOOST_FUNCTION_COMPARE_TYPE_ID
 
 #endif // BOOST_FUNCTION_BASE_HEADER

include/boost/function/function_template.hpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -307,9 +307,6 @@ namespace boost {
 
     ~BOOST_FUNCTION_FUNCTION() { clear(); }
 
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
-    // MSVC 6.0 and prior require all definitions to be inline, but
-    // these definitions can become very costly.
     result_type operator()(BOOST_FUNCTION_PARMS) const
     {
       if (this->empty())
@@ -325,9 +322,6 @@ namespace boost {
       return result;
 #endif // BOOST_NO_VOID_RETURNS
     }
-#else
-    result_type operator()(BOOST_FUNCTION_PARMS) const;
-#endif
 
     // The distinction between when to use BOOST_FUNCTION_FUNCTION and
     // when to use self_type is obnoxious. MSVC cannot handle self_type as
@@ -444,9 +438,9 @@ namespace boost {
                            R BOOST_FUNCTION_COMMA
                            BOOST_FUNCTION_TEMPLATE_ARGS
                          >::type
-          actual_invoker_type;
+          invoker_type;
 
-        invoker = &actual_invoker_type::invoke;
+        invoker = &invoker_type::invoke;
         this->manager =
           &detail::function::functor_manager<FunctionPtr, Allocator>::manage;
         this->functor =
@@ -477,16 +471,16 @@ namespace boost {
                                        R BOOST_FUNCTION_COMMA
                                        BOOST_FUNCTION_TEMPLATE_ARGS
                                      >::type
-          actual_invoker_type;
+          invoker_type;
 
-        invoker = &actual_invoker_type::invoke;
+        invoker = &invoker_type::invoke;
         this->manager = &detail::function::functor_manager<
                                     FunctionObj, Allocator>::manage;
 #ifndef BOOST_NO_STD_ALLOCATOR
         typedef typename Allocator::template rebind<FunctionObj>::other
-          rebound_allocator_type;
-        typedef typename rebound_allocator_type::pointer pointer_type;
-        rebound_allocator_type allocator;
+          allocator_type;
+        typedef typename allocator_type::pointer pointer_type;
+        allocator_type allocator;
         pointer_type copy = allocator.allocate(1);
         allocator.construct(copy, f);
 
@@ -511,9 +505,9 @@ namespace boost {
                                        R BOOST_FUNCTION_COMMA
                                        BOOST_FUNCTION_TEMPLATE_ARGS
                                      >::type
-          actual_invoker_type;
+          invoker_type;
 
-        invoker = &actual_invoker_type::invoke;
+        invoker = &invoker_type::invoke;
         this->manager = &detail::function::trivial_manager<FunctionObj>::get;
         this->functor =
           this->manager(
@@ -533,8 +527,8 @@ namespace boost {
                        R BOOST_FUNCTION_COMMA
                        BOOST_FUNCTION_TEMPLATE_ARGS
                      >::type
-          actual_invoker_type;
-      invoker = &actual_invoker_type::invoke;
+          invoker_type;
+      invoker = &invoker_type::invoke;
       this->manager = &detail::function::trivial_manager<FunctionObj>::get;
       this->functor = detail::function::make_any_pointer(this);
     }
@@ -562,32 +556,6 @@ namespace boost {
     f1.swap(f2);
   }
 
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
-  template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS,
-           typename Allocator>
-  typename BOOST_FUNCTION_FUNCTION<
-      R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS, 
-      Allocator>::result_type
-   BOOST_FUNCTION_FUNCTION<R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS,
-
-                           Allocator>
-  ::operator()(BOOST_FUNCTION_PARMS) const
-  {
-      if (this->empty())
-        boost::throw_exception(bad_function_call());
-
-      internal_result_type result = invoker(this->functor
-                                            BOOST_FUNCTION_COMMA
-                                            BOOST_FUNCTION_ARGS);
-
-#  ifndef BOOST_NO_VOID_RETURNS
-      return static_cast<result_type>(result);
-#  else
-      return result;
-#  endif // BOOST_NO_VOID_RETURNS
-    }
-#endif
-
 // Poison comparisons between boost::function objects of the same type.
 template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
          typename Allocator>
@@ -610,6 +578,177 @@ template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
                           BOOST_FUNCTION_TEMPLATE_ARGS ,
                   Allocator>&);
 
+#ifdef BOOST_NO_SFINAE
+// Comparisons between boost::function objects and arbitrary function objects
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  inline bool
+  operator==(const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f,
+             Functor g)
+  {
+    typedef mpl::bool_<(is_integral<Functor>::value)> integral;
+    return detail::function::compare_equal(f, g, 0, integral());
+  }
+
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  inline bool
+  operator==(Functor g,
+             const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f)
+  {
+    typedef mpl::bool_<(is_integral<Functor>::value)> integral;
+    return detail::function::compare_equal(f, g, 0, integral());
+  }
+
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  inline bool
+  operator!=(const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f,
+             Functor g)
+  {
+    typedef mpl::bool_<(is_integral<Functor>::value)> integral;
+    return detail::function::compare_not_equal(f, g, 0, integral());
+  }
+
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  inline bool
+  operator!=(Functor g,
+             const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f)
+  {
+    typedef mpl::bool_<(is_integral<Functor>::value)> integral;
+    return detail::function::compare_not_equal(f, g, 0, integral());
+  }
+#else
+
+#define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type)           \
+  typename enable_if_c<(::boost::type_traits::ice_not<                \
+                         (is_integral<Functor>::value)>::value),      \
+                       Type>::type
+
+// Comparisons between boost::function objects and arbitrary function objects
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
+  operator==(const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f,
+             Functor g)
+  {
+    if (const Functor* fp = f.template target<Functor>()) return *fp == g;
+    else return false;
+  }
+
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
+  operator==(Functor g,
+             const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f)
+  {
+    if (const Functor* fp = f.template target<Functor>()) return g == *fp;
+    else return false;
+  }
+
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
+  operator!=(const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f,
+             Functor g)
+  {
+    if (const Functor* fp = f.template target<Functor>()) return *fp != g;
+    else return true;
+  }
+
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
+  operator!=(Functor g,
+             const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f)
+  {
+    if (const Functor* fp = f.template target<Functor>()) return g != *fp;
+    else return true;
+  }
+
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
+  operator==(const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f,
+             reference_wrapper<Functor> g)
+  {
+    if (const Functor* fp = f.template target<Functor>())
+      return fp == g.get_pointer();
+    else return false;
+  }
+
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
+  operator==(reference_wrapper<Functor> g,
+             const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f)
+  {
+    if (const Functor* fp = f.template target<Functor>())
+      return g.get_pointer() == fp;
+    else return false;
+  }
+
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
+  operator!=(const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f,
+             reference_wrapper<Functor> g)
+  {
+    if (const Functor* fp = f.template target<Functor>())
+      return fp != g.get_pointer();
+    else return true;
+  }
+
+template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
+         typename Allocator, typename Functor>
+  BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
+  operator!=(reference_wrapper<Functor> g,
+             const BOOST_FUNCTION_FUNCTION<
+                     R BOOST_FUNCTION_COMMA
+                     BOOST_FUNCTION_TEMPLATE_ARGS ,
+                     Allocator>& f)
+  {
+    if (const Functor* fp = f.template target<Functor>())
+      return g.get_pointer() != fp;
+    else return true;
+  }
+#undef BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL
+#endif // Compiler supporting SFINAE
+
 #if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
 
 #if BOOST_FUNCTION_NUM_ARGS == 0

include/boost/function/gen_function_N.pl

@@ -2,7 +2,7 @@
 #
 # Boost.Function library
 #
-# Copyright Douglas Gregor 2001-2003. Use, modification and
+# Copyright Doug Gregor 2001-2003. Use, modification and
 # distribution is subject to the Boost Software License, Version
 # 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)

include/boost/function_equal.hpp

@@ -1,24 +0,0 @@
-//  Copyright Douglas Gregor 2004. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-#ifndef BOOST_FUNCTION_EQUAL_HPP
-#define BOOST_FUNCTION_EQUAL_HPP
-
-namespace boost {
-
-namespace detail {
-  template<typename F, typename G>
-    bool function_equal_impl(const F& f, const G& g, long)
-    { return f == g; }
-} // end namespace boost::function
-
-template<typename F, typename G>
-  bool function_equal(const F& f, const G& g)
-  { return ::boost::detail::function_equal_impl(f, g, 0); }
-
-} // end namespace boost
-
-#endif // BOOST_FUNCTION_EQUAL_HPP

test/Jamfile.v2

@@ -1,6 +1,6 @@
 # Function library
 
-# Copyright Douglas Gregor 2001-2003. Use, modification and
+# Copyright Doug Gregor 2001-2003. Use, modification and
 # distribution is subject to the Boost Software License, Version
 # 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
@@ -53,9 +53,6 @@ import testing ;
   [ run libs/function/test/function_ref_cxx98.cpp :  :  :  :  ]
 
   [ run libs/function/test/function_ref_portable.cpp :  :  :  :  ]
-  
-  [ run libs/function/test/contains_test.cpp : : : : ]
-   
  ;
 }
-      
+      

test/allocator_test.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

test/contains_test.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2004. Use, modification and
+//  Copyright Doug Gregor 2004. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -56,46 +56,34 @@ static void equal_test()
 
   f = &forty_two;
   BOOST_TEST(f == &forty_two);
-  BOOST_TEST(f != ReturnInt(17));
-#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
   BOOST_TEST(&forty_two == f);
+  BOOST_TEST(f != ReturnInt(17));
   BOOST_TEST(ReturnInt(17) != f);
-#endif
-
-  BOOST_TEST(f.contains(&forty_two));
 
   f = ReturnInt(17);
   BOOST_TEST(f != &forty_two);
-  BOOST_TEST(f == ReturnInt(17));
-  BOOST_TEST(f != ReturnInt(16));
-#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
   BOOST_TEST(&forty_two != f);
+  BOOST_TEST(f == ReturnInt(17));
   BOOST_TEST(ReturnInt(17) == f);
+  BOOST_TEST(f != ReturnInt(16));
   BOOST_TEST(ReturnInt(16) != f);
-#endif
-
-  BOOST_TEST(f.contains(ReturnInt(17)));
 
 #if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
   boost::function<int(void)> g;
 
   g = &forty_two;
   BOOST_TEST(g == &forty_two);
-  BOOST_TEST(g != ReturnInt(17));
-#  if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
   BOOST_TEST(&forty_two == g);
+  BOOST_TEST(g != ReturnInt(17));
   BOOST_TEST(ReturnInt(17) != g);
-#  endif
 
   g = ReturnInt(17);
   BOOST_TEST(g != &forty_two);
-  BOOST_TEST(g == ReturnInt(17));
-  BOOST_TEST(g != ReturnInt(16));
-#  if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
   BOOST_TEST(&forty_two != g);
+  BOOST_TEST(g == ReturnInt(17));
   BOOST_TEST(ReturnInt(17) == g);
+  BOOST_TEST(g != ReturnInt(16));
   BOOST_TEST(ReturnInt(16) != g);
-#  endif
 #endif
 }
 
@@ -109,26 +97,22 @@ static void ref_equal_test()
     BOOST_TEST(f == boost::ref(ri));
     BOOST_TEST(f == ri);
     BOOST_TEST(boost::ref(ri) == f);
+    BOOST_TEST(ri == f);
     BOOST_TEST(!(f != boost::ref(ri)));
     BOOST_TEST(!(f != ri));
     BOOST_TEST(!(boost::ref(ri) != f));
-#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
-    BOOST_TEST(ri == f);
     BOOST_TEST(!(ri != f));
-#endif
 
     // Values equal, references inequal
     ReturnInt ri2(17);
     BOOST_TEST(f == ri2);
     BOOST_TEST(f != boost::ref(ri2));
+    BOOST_TEST(ri2 == f);
     BOOST_TEST(boost::ref(ri2) != f);
     BOOST_TEST(!(f != ri2));
     BOOST_TEST(!(f == boost::ref(ri2)));
-    BOOST_TEST(!(boost::ref(ri2) == f));
-#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
-    BOOST_TEST(ri2 == f);
     BOOST_TEST(!(ri2 != f));
-#endif 
+    BOOST_TEST(!(boost::ref(ri2) == f));
   }
 
 #if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
@@ -140,26 +124,22 @@ static void ref_equal_test()
     BOOST_TEST(f == boost::ref(ri));
     BOOST_TEST(f == ri);
     BOOST_TEST(boost::ref(ri) == f);
+    BOOST_TEST(ri == f);
     BOOST_TEST(!(f != boost::ref(ri)));
     BOOST_TEST(!(f != ri));
     BOOST_TEST(!(boost::ref(ri) != f));
-#  if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
-    BOOST_TEST(ri == f);
     BOOST_TEST(!(ri != f));
-#  endif
 
     // Values equal, references inequal
     ReturnInt ri2(17);
     BOOST_TEST(f == ri2);
     BOOST_TEST(f != boost::ref(ri2));
+    BOOST_TEST(ri2 == f);
     BOOST_TEST(boost::ref(ri2) != f);
     BOOST_TEST(!(f != ri2));
     BOOST_TEST(!(f == boost::ref(ri2)));
-    BOOST_TEST(!(boost::ref(ri2) == f));
-#  if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
-    BOOST_TEST(ri2 == f);
     BOOST_TEST(!(ri2 != f));
-#  endif
+    BOOST_TEST(!(boost::ref(ri2) == f));
   }
 #endif
 }

test/function_30.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

test/function_n_test.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

test/function_test.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

test/function_test_fail1.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

test/function_test_fail2.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

test/lambda_test.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
+//  Copyright Doug Gregor 2002-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

test/stateless_test.cpp

@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Douglas Gregor 2001-2003. Use, modification and
+//  Copyright Doug Gregor 2001-2003. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)