feedc0de/boost_function
1
0
Fork 0
forked from boostorg/function
Code Pull Requests Activity

function/function_base.hpp, function/function_template.hpp:

Browse Source 
- Switch from dynamic initialization of the vtable pointer to static
    initialization (Fixes #1260)
  - Handle member pointers properly, only using mem_fn within the invoker
    to deal with all of the messy bits of calling member pointers



[SVN r39240]
This commit is contained in:
Douglas Gregor
2007-09-13 17:38:58 +00:00
parent a7b9940f15
commit de27ae9697
2 changed files with 220 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/boost/function/function_base.hpp
View File

@ -211,8 +211,8 @@ namespace boost {
struct reference_manager
{
static inline void
get(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op)
manage(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op)
{
switch (op) {
case clone_functor_tag:
@ -381,6 +381,15 @@ namespace boost {
mpl::bool_<(function_allows_small_object_optimization<functor_type>::value)>());
}
// For member pointers, we treat them as function objects with
// the small-object optimization always enabled.
static inline void
manager(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op, member_ptr_tag)
{
manager(in_buffer, out_buffer, op, mpl::true_());
}
public:
/* Dispatch to an appropriate manager based on whether we have a
function pointer or a function object pointer. */
@ -571,7 +580,7 @@ public:
#endif
public: // should be protected, but GCC 2.95.3 will fail to allow access
detail::function::vtable_base* vtable;
const detail::function::vtable_base* vtable;
mutable detail::function::function_buffer functor;
};