Merge from trunk

[SVN r39768]
This commit is contained in:
Nicola Musatti committed 2007-10-07 20:10:53 +00:00
1 parent 5073f4fd97
commit d8c93cdc8d
1 file changed
+2 -1
+2 -1
View File
@@ -437,8 +437,9 @@ namespace boost {
if (base.manager) if (base.manager)
base.manager(functor, functor, destroy_functor_tag); base.manager(functor, functor, destroy_functor_tag);
} }
#ifndef BOOST_NO_PRIVATE_IN_AGGREGATE
private: private:
#endif
// Function pointers // Function pointers
template<typename FunctionPtr> template<typename FunctionPtr>
bool bool