Merge from trunk

[SVN r39768]
2007-10-07 20:10:53 +00:00
parent 5073f4fd97
commit d8c93cdc8d
1 changed files with 2 additions and 1 deletions
--- a/include/boost/function/function_template.hpp
+++ b/include/boost/function/function_template.hpp
@ -437,8 +437,9 @@ namespace boost {
          if (base.manager)
            base.manager(functor, functor, destroy_functor_tag);
        }
-
+#ifndef BOOST_NO_PRIVATE_IN_AGGREGATE
      private:
+#endif
        // Function pointers
        template<typename FunctionPtr>
        bool