Quickbook: Copy trunk headers into quickbook-dev.

[SVN r75212]
Remove extraneous semicolon
2011-11-01 13:03:44 +00:00 · 2011-10-11 15:23:29 +00:00 · 2011-05-31 21:12:35 +00:00 · 2011-03-27 10:17:05 +00:00 · 2011-03-21 09:01:18 +00:00 · 2011-01-02 05:13:03 +00:00
5 changed files with 47 additions and 56 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@ -10,6 +10,7 @@ boostbook function-doc
    : 
    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
@ -486,19 +486,19 @@ namespace boost {
                                            BOOST_FUNCTION_TEMPLATE_ARGS);

        template<typename F>
-        bool assign_to(F f, function_buffer& functor)
+        bool assign_to(F f, function_buffer& functor) const
        {
          typedef typename get_function_tag<F>::type tag;
          return assign_to(f, functor, tag());
        }
        template<typename F,typename Allocator>
-        bool assign_to_a(F f, function_buffer& functor, Allocator a)
+        bool assign_to_a(F f, function_buffer& functor, Allocator a) const
        {
          typedef typename get_function_tag<F>::type tag;
          return assign_to_a(f, functor, a, tag());
        }

-        void clear(function_buffer& functor)
+        void clear(function_buffer& functor) const
        {
          if (base.manager)
            base.manager(functor, functor, destroy_functor_tag);
@ -508,7 +508,7 @@ namespace boost {
        // Function pointers
        template<typename FunctionPtr>
        bool 
-        assign_to(FunctionPtr f, function_buffer& functor, function_ptr_tag)
+        assign_to(FunctionPtr f, function_buffer& functor, function_ptr_tag) const
        {
          this->clear(functor);
          if (f) {
@ -522,7 +522,7 @@ namespace boost {
        }
        template<typename FunctionPtr,typename Allocator>
        bool 
-        assign_to_a(FunctionPtr f, function_buffer& functor, Allocator, function_ptr_tag)
+        assign_to_a(FunctionPtr f, function_buffer& functor, Allocator, function_ptr_tag) const
        {
          return assign_to(f,functor,function_ptr_tag());
        }
@ -530,7 +530,7 @@ namespace boost {
        // Member pointers
 #if BOOST_FUNCTION_NUM_ARGS > 0
        template<typename MemberPtr>
-        bool assign_to(MemberPtr f, function_buffer& functor, member_ptr_tag)
+        bool assign_to(MemberPtr f, function_buffer& functor, member_ptr_tag) const
        {
          // DPG TBD: Add explicit support for member function
          // objects, so we invoke through mem_fn() but we retain the
@ -543,7 +543,7 @@ namespace boost {
          }
        }
        template<typename MemberPtr,typename Allocator>
-        bool assign_to_a(MemberPtr f, function_buffer& functor, Allocator a, member_ptr_tag)
+        bool assign_to_a(MemberPtr f, function_buffer& functor, Allocator a, member_ptr_tag) const
        {
          // DPG TBD: Add explicit support for member function
          // objects, so we invoke through mem_fn() but we retain the
@ -561,13 +561,13 @@ namespace boost {
        // Assign to a function object using the small object optimization
        template<typename FunctionObj>
        void 
-        assign_functor(FunctionObj f, function_buffer& functor, mpl::true_)
+        assign_functor(FunctionObj f, function_buffer& functor, mpl::true_) const
        {
          new (reinterpret_cast<void*>(&functor.data)) FunctionObj(f);
        }
        template<typename FunctionObj,typename Allocator>
        void 
-        assign_functor_a(FunctionObj f, function_buffer& functor, Allocator, mpl::true_)
+        assign_functor_a(FunctionObj f, function_buffer& functor, Allocator, mpl::true_) const
        {
          assign_functor(f,functor,mpl::true_());
        }
@ -575,13 +575,13 @@ namespace boost {
        // Assign to a function object allocated on the heap.
        template<typename FunctionObj>
        void 
-        assign_functor(FunctionObj f, function_buffer& functor, mpl::false_)
+        assign_functor(FunctionObj f, function_buffer& functor, mpl::false_) const
        {
          functor.obj_ptr = new FunctionObj(f);
        }
        template<typename FunctionObj,typename Allocator>
        void 
-        assign_functor_a(FunctionObj f, function_buffer& functor, Allocator a, mpl::false_)
+        assign_functor_a(FunctionObj f, function_buffer& functor, Allocator a, mpl::false_) const
        {
          typedef functor_wrapper<FunctionObj,Allocator> functor_wrapper_type;
          typedef typename Allocator::template rebind<functor_wrapper_type>::other
@ -596,7 +596,7 @@ namespace boost {

        template<typename FunctionObj>
        bool 
-        assign_to(FunctionObj f, function_buffer& functor, function_obj_tag)
+        assign_to(FunctionObj f, function_buffer& functor, function_obj_tag) const
        {
          if (!boost::detail::function::has_empty_target(boost::addressof(f))) {
            assign_functor(f, functor, 
@ -608,7 +608,7 @@ namespace boost {
        }
        template<typename FunctionObj,typename Allocator>
        bool 
-        assign_to_a(FunctionObj f, function_buffer& functor, Allocator a, function_obj_tag)
+        assign_to_a(FunctionObj f, function_buffer& functor, Allocator a, function_obj_tag) const
        {
          if (!boost::detail::function::has_empty_target(boost::addressof(f))) {
            assign_functor_a(f, functor, a,
@ -623,7 +623,7 @@ namespace boost {
        template<typename FunctionObj>
        bool 
        assign_to(const reference_wrapper<FunctionObj>& f, 
-                  function_buffer& functor, function_obj_ref_tag)
+                  function_buffer& functor, function_obj_ref_tag) const
        {
          functor.obj_ref.obj_ptr = (void *)(f.get_pointer());
          functor.obj_ref.is_const_qualified = is_const<FunctionObj>::value;
@ -633,7 +633,7 @@ namespace boost {
        template<typename FunctionObj,typename Allocator>
        bool 
        assign_to_a(const reference_wrapper<FunctionObj>& f, 
-                  function_buffer& functor, Allocator, function_obj_ref_tag)
+                  function_buffer& functor, Allocator, function_obj_ref_tag) const
        {
          return assign_to(f,functor,function_obj_ref_tag());
        }
@ -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
@ -864,7 +858,7 @@ namespace boost {
 #else
  private:
    struct dummy {
-      void nonnull() {};
+      void nonnull() {}
    };

    typedef void (dummy::*safe_bool)();
@ -909,7 +903,7 @@ namespace boost {
      // static initialization. Otherwise, we will have a race
      // condition here in multi-threaded code. See
      // http://thread.gmane.org/gmane.comp.lib.boost.devel/164902/.
-      static vtable_type stored_vtable = 
+      static const vtable_type stored_vtable = 
        { { &manager_type::manage }, &invoker_type::invoke };

      if (stored_vtable.assign_to(f, functor)) {
@ -943,7 +937,7 @@ namespace boost {
      // static initialization. Otherwise, we will have a race
      // condition here in multi-threaded code. See
      // http://thread.gmane.org/gmane.comp.lib.boost.devel/164902/.
-      static vtable_type stored_vtable =
+      static const vtable_type stored_vtable =
        { { &manager_type::manage }, &invoker_type::invoke };

      if (stored_vtable.assign_to_a(f, functor, a)) { 
@ -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<
--- a/test/mem_fun_cxx98.cpp
+++ b/test/mem_fun_cxx98.cpp
@ -10,22 +10,28 @@

    
 #include <boost/function.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <iostream>
 #include <functional>

 struct X {
  int foo(int);
+  std::ostream& foo2(std::ostream&) const;
 };
 int X::foo(int x) { return -x; }
+std::ostream& X::foo2(std::ostream& x) const { return x; }

 int main()
 {
    boost::function<int (X*, int)> f;
+    boost::function<std::ostream& (X*, std::ostream&)> f2;

-f = &X::foo;
+    f = &X::foo;
+    f2 = &X::foo2;

-X x;
-f(&x, 5);
+    X x;
+    BOOST_TEST(f(&x, 5) == -5);
+    BOOST_TEST(f2(&x, boost::ref(std::cout)) == std::cout);

-    return 0;
+    return ::boost::report_errors();
 }
--- a/test/mem_fun_portable.cpp
+++ b/test/mem_fun_portable.cpp
@ -10,22 +10,28 @@

    
 #include <boost/function.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <iostream>
 #include <functional>

 struct X {
  int foo(int);
+  std::ostream& foo2(std::ostream&) const;
 };
 int X::foo(int x) { return -x; }
+std::ostream& X::foo2(std::ostream& x) const { return x; }

 int main()
 {
    boost::function2<int, X*, int> f;
+    boost::function2<std::ostream&, X*, std::ostream&> f2;

-f = &X::foo;
+    f = &X::foo;
+    f2 = &X::foo2;

-X x;
-f(&x, 5);
+    X x;
+    BOOST_TEST(f(&x, 5) == -5);
+    BOOST_TEST(f2(&x, boost::ref(std::cout)) == std::cout);

-    return 0;
+    return ::boost::report_errors();
 }
Author	SHA1	Message	Date
Daniel James	b8441ea7cc	Quickbook: Copy trunk headers into quickbook-dev. [SVN r75212]	2011-11-01 13:03:44 +00:00
Marshall Clow	775213a9e6	Remove extraneous semicolon [SVN r74916]	2011-10-11 15:23:29 +00:00
Marshall Clow	cbb9e7c4da	Applied patch from #4717 [SVN r72316]	2011-05-31 21:12:35 +00:00
Daniel James	2fb5538223	Quickbook: New branch for development. From now on this will be my development branch. [SVN r70613]	2011-03-27 10:17:05 +00:00
Daniel James	7ee94c6975	Function: Extra member tests, to catch #4073 . [SVN r70301]	2011-03-21 09:01:18 +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