Branch to work on filename handling without disturbing trunk.

[SVN r68345]
Remove extra definition of operator(), since it's inline anyway. Fixes #4765 .
2025-06-26 12:31:33 +02:00 · 2011-01-21 09:17:08 +00:00 · 2011-01-02 05:13:03 +00:00 · 2010-06-26 12:10:47 +00:00 · 2010-06-20 18:00:48 +00:00 · 2010-06-09 15:40:48 +00:00
3 changed files with 7 additions and 28 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@ -7,9 +7,10 @@ project boost/doc ;
 import boostbook : boostbook ;

 boostbook function-doc 
-	: 
-	function.xml 
-	:
+    : 
+    function.xml 
+    :
+        <xsl:param>boost.root=../../../..
        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
-	;
+    ;

--- a/include/boost/function/function_base.hpp
+++ b/include/boost/function/function_base.hpp
@ -203,11 +203,11 @@ namespace boost {
        {
          switch (op) {
          case clone_functor_tag: 
-            out_buffer.obj_ref.obj_ptr = in_buffer.obj_ref.obj_ptr;
+            out_buffer.obj_ref = in_buffer.obj_ref;
            return;

          case move_functor_tag:
-            out_buffer.obj_ref.obj_ptr = in_buffer.obj_ref.obj_ptr;
+            out_buffer.obj_ref = in_buffer.obj_ref;
            in_buffer.obj_ref.obj_ptr = 0;
            return;

--- a/include/boost/function/function_template.hpp
+++ b/include/boost/function/function_template.hpp
@ -751,9 +751,6 @@ namespace boost {

    ~BOOST_FUNCTION_FUNCTION() { clear(); }

-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-    // 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())
@ -762,9 +759,6 @@ namespace boost {
      return get_vtable()->invoker
               (this->functor BOOST_FUNCTION_COMMA BOOST_FUNCTION_ARGS);
    }
-#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
@ -998,22 +992,6 @@ namespace boost {
    f1.swap(f2);
  }

-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-  template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
-  typename BOOST_FUNCTION_FUNCTION<
-      R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS>::result_type
-  inline 
-  BOOST_FUNCTION_FUNCTION<R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS>
-  ::operator()(BOOST_FUNCTION_PARMS) const
-  {
-    if (this->empty())
-      boost::throw_exception(bad_function_call());
-
-    return get_vtable()->invoker
-             (this->functor BOOST_FUNCTION_COMMA BOOST_FUNCTION_ARGS);
-  }
-#endif
-
 // Poison comparisons between boost::function objects of the same type.
 template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
  void operator==(const BOOST_FUNCTION_FUNCTION<
Author	SHA1	Message	Date
Daniel James	2dd23d107a	Branch to work on filename handling without disturbing trunk. [SVN r68345]	2011-01-21 09:17:08 +00:00
Steven Watanabe	8cde82a568	Remove extra definition of operator(), since it's inline anyway. Fixes #4765 . [SVN r67560]	2011-01-02 05:13:03 +00:00
Daniel James	9ea95b071b	Detab some jamfiles. [SVN r63343]	2010-06-26 12:10:47 +00:00
Daniel James	09fc8792fa	Update various libraries' documentation build. Mostly to use the images and css files under doc/src instead of doc/html, usually be deleting the settings in order to use the defaults. Also add 'boost.root' to some builds in order to fix links which rely on it. [SVN r63146]	2010-06-20 18:00:48 +00:00
Steven Watanabe	c0d4005441	Make sure that the cv flags are copied when we copy a reference to a function object. Fixes #4325 [SVN r62665]	2010-06-09 15:40:48 +00:00