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

Finalizes the fix to Bug #1260, making vtable_base an actual POD type (oops)

Browse Source 
and playing more nicely with reinterpret_cast (thanks to Brad King for the
fixes).



[SVN r39285]
This commit is contained in:
Douglas Gregor
2007-09-14 21:05:46 +00:00
parent 3312c7ffcd
commit 53b95c386d
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,7 +478,6 @@ namespace boost {
*/
struct vtable_base
{
vtable_base() : manager(0) { }
void (*manager)(const function_buffer& in_buffer,
function_buffer& out_buffer,
functor_manager_operation_type op);

13
include/boost/function/function_template.hpp
View File

@ -434,8 +434,8 @@ namespace boost {
void clear(function_buffer& functor) const
{
if (manager)
manager(functor, functor, destroy_functor_tag);
if (base.manager)
base.manager(functor, functor, destroy_functor_tag);
}
private:
@ -538,9 +538,7 @@ namespace boost {
}
public:
void (*manager)(const function_buffer& in_buffer,
function_buffer& out_buffer,
functor_manager_operation_type op);
vtable_base base;
invoker_type invoker;
};
} // end namespace function
@ -780,10 +778,9 @@ namespace boost {
typedef typename handler_type::manager_type manager_type;
static const vtable_type stored_vtable =
{ &manager_type::manage, &invoker_type::invoke };
{ { &manager_type::manage }, &invoker_type::invoke };
if (stored_vtable.assign_to(f, functor))
vtable = reinterpret_cast<const vtable_base*>(&stored_vtable);
if (stored_vtable.assign_to(f, functor)) vtable = &stored_vtable.base;
else vtable = 0;
}
};