boostorg/function
1
0
Fork 1
mirror of https://github.com/boostorg/function.git synced 2025-07-25 02:17:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

General cleanups

Browse Source 
[SVN r11791]
This commit is contained in:
Douglas Gregor
2001-11-27 23:11:44 +00:00
parent c64a2f3492
commit 2265421357
4 changed files with 21 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/function.hpp
View File

@ -459,10 +459,9 @@ namespace boost {
function(const Functor& f) : base_type(f) {} function(const Functor& f) : base_type(f) {}
#ifdef __BORLANDC__ #ifdef __BORLANDC__
template<typename Functor> template<typename Functor> function(Functor* f) : base_type(f) {}
function(Functor* f) : base_type(f) {}
#endif // __BORLANDC__ #endif // __BORLANDC__
function(const self_type& f) : base_type(static_cast<const base_type&>(f)){} function(const self_type& f) : base_type(static_cast<const base_type&>(f)){}
template<typename Functor> template<typename Functor>

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

@ -79,17 +79,13 @@ namespace boost {
* so function requires a union of the two. */ * so function requires a union of the two. */
union any_pointer union any_pointer
{ {
struct container {};
void* obj_ptr; void* obj_ptr;
const void* const_obj_ptr; const void* const_obj_ptr;
void (*func_ptr)(); void (*func_ptr)();
void (container::* mem_func_ptr)();
explicit any_pointer(void* p) : obj_ptr(p) {} explicit any_pointer(void* p) : obj_ptr(p) {}
explicit any_pointer(const void* p) : const_obj_ptr(p) {} explicit any_pointer(const void* p) : const_obj_ptr(p) {}
explicit any_pointer(void (*p)()) : func_ptr(p) {} explicit any_pointer(void (*p)()) : func_ptr(p) {}
explicit any_pointer(void (container::*p)()) : mem_func_ptr(p) {}
}; };
/** /**
@ -118,8 +114,8 @@ namespace boost {
// The operation type to perform on the given functor/function pointer // The operation type to perform on the given functor/function pointer
enum functor_manager_operation_type { enum functor_manager_operation_type {
clone_functor, clone_functor_tag,
destroy_functor destroy_functor_tag
}; };
// Tags used to decide between different types of functions // Tags used to decide between different types of functions
@ -155,26 +151,12 @@ namespace boost {
manager(any_pointer function_ptr, functor_manager_operation_type op, manager(any_pointer function_ptr, functor_manager_operation_type op,
function_ptr_tag) function_ptr_tag)
{ {
if (op == clone_functor) if (op == clone_functor_tag)
return function_ptr; return function_ptr;
else else
return any_pointer(static_cast<void (*)()>(0)); return any_pointer(static_cast<void (*)()>(0));
} }
// For member function pointers, the manager is trivial
static inline any_pointer
manager(any_pointer member_ptr, functor_manager_operation_type op,
member_ptr_tag)
{
if (op == clone_functor)
return member_ptr;
else {
typedef void (any_pointer::container::* stored_mem_func_type)();
stored_mem_func_type p = 0;
return any_pointer(p);
}
}
// For function object pointers, we clone the pointer to each // For function object pointers, we clone the pointer to each
// function has its own version. // function has its own version.
static inline any_pointer static inline any_pointer
@ -194,7 +176,7 @@ namespace boost {
allocator_type allocator; allocator_type allocator;
# endif // BOOST_NO_STD_ALLOCATOR # endif // BOOST_NO_STD_ALLOCATOR
if (op == clone_functor) { if (op == clone_functor_tag) {
functor_type* f = functor_type* f =
static_cast<functor_type*>(function_obj_ptr.obj_ptr); static_cast<functor_type*>(function_obj_ptr.obj_ptr);

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

@ -50,16 +50,10 @@
BOOST_JOIN(function_obj_invoker,BOOST_FUNCTION_NUM_ARGS) BOOST_JOIN(function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER \ #define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER \
BOOST_JOIN(void_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS) BOOST_JOIN(void_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
#define BOOST_FUNCTION_MEM_FUNCTION_INVOKER \
BOOST_JOIN(mem_function_invoker,BOOST_FUNCTION_NUM_ARGS)
#define BOOST_FUNCTION_VOID_MEM_FUNCTION_INVOKER \
BOOST_JOIN(void_mem_function_invoker,BOOST_FUNCTION_NUM_ARGS)
#define BOOST_FUNCTION_GET_FUNCTION_INVOKER \ #define BOOST_FUNCTION_GET_FUNCTION_INVOKER \
BOOST_JOIN(get_function_invoker,BOOST_FUNCTION_NUM_ARGS) BOOST_JOIN(get_function_invoker,BOOST_FUNCTION_NUM_ARGS)
#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER \ #define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER \
BOOST_JOIN(get_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS) BOOST_JOIN(get_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
#define BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER \
BOOST_JOIN(get_mem_function_invoker,BOOST_FUNCTION_NUM_ARGS)
namespace boost { namespace boost {
namespace detail { namespace detail {
@ -130,43 +124,6 @@ namespace boost {
} }
}; };
#if BOOST_FUNCTION_NUM_ARGS > 0
template<
typename MemFunctionPtr,
typename R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_PARMS
>
struct BOOST_FUNCTION_MEM_FUNCTION_INVOKER
{
static R invoke(any_pointer mem_function_ptr
BOOST_FUNCTION_COMMA
BOOST_FUNCTION_PARMS)
{
// Was a reinterpret_cast<>, but not all compilers handle it
MemFunctionPtr f = (MemFunctionPtr)(mem_function_ptr.mem_func_ptr);
return mem_fn(f)(BOOST_FUNCTION_ARGS);
}
};
template<
typename MemFunctionPtr,
typename R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_PARMS
>
struct BOOST_FUNCTION_VOID_MEM_FUNCTION_INVOKER
{
static unusable invoke(any_pointer mem_function_ptr
BOOST_FUNCTION_COMMA
BOOST_FUNCTION_PARMS)
{
// Was a reinterpret_cast<>, but not all compilers handle it
MemFunctionPtr f = (MemFunctionPtr)(mem_function_ptr.mem_func_ptr);
mem_fn(f)(BOOST_FUNCTION_ARGS);
return unusable();
}
};
#endif // BOOST_FUNCTION_NUM_ARGS > 0
template< template<
typename FunctionPtr, typename FunctionPtr,
typename R BOOST_FUNCTION_COMMA typename R BOOST_FUNCTION_COMMA
@ -208,29 +165,6 @@ namespace boost {
> >
>::type type; >::type type;
}; };
#if BOOST_FUNCTION_NUM_ARGS > 0
template<
typename MemFunctionPtr,
typename R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_PARMS
>
struct BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER
{
typedef typename IF<(is_void<R>::value),
BOOST_FUNCTION_VOID_MEM_FUNCTION_INVOKER<
MemFunctionPtr,
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>,
BOOST_FUNCTION_MEM_FUNCTION_INVOKER<
MemFunctionPtr,
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>
>::type type;
};
#endif // BOOST_FUNCTION_NUM_ARGS > 0
} // end namespace function } // end namespace function
} // end namespace detail } // end namespace detail
@ -275,6 +209,15 @@ namespace boost {
this->assign_to(f); this->assign_to(f);
} }
#ifdef __BORLANDC__
template<typename Functor>
BOOST_FUNCTION_FUNCTION(Functor* f) :
function_base(), Mixin(), invoker(0)
{
this->assign_to(f);
}
#endif // __BORLANDC__
template<typename Functor> template<typename Functor>
BOOST_FUNCTION_FUNCTION(const Functor& f, const Mixin& m) : BOOST_FUNCTION_FUNCTION(const Functor& f, const Mixin& m) :
function_base(), Mixin(m), invoker(0) function_base(), Mixin(m), invoker(0)
@ -282,15 +225,6 @@ namespace boost {
this->assign_to(f); this->assign_to(f);
} }
#ifdef __BORLANDC__
template<typename Functor>
BOOST_FUNCTION_FUNCTION(Functor* f, const Mixin& m = Mixin()) :
function_base(), Mixin(m), invoker(0)
{
this->assign_to(f);
}
#endif // __BORLANDC__
BOOST_FUNCTION_FUNCTION(const BOOST_FUNCTION_FUNCTION& f) : BOOST_FUNCTION_FUNCTION(const BOOST_FUNCTION_FUNCTION& f) :
function_base(), Mixin(static_cast<const Mixin&>(f)), invoker(0) function_base(), Mixin(static_cast<const Mixin&>(f)), invoker(0)
{ {
@ -382,7 +316,7 @@ namespace boost {
void clear() void clear()
{ {
if (manager) if (manager)
functor = manager(functor, detail::function::destroy_functor); functor = manager(functor, detail::function::destroy_functor_tag);
manager = 0; manager = 0;
invoker = 0; invoker = 0;
@ -394,7 +328,7 @@ namespace boost {
if (!f.empty()) { if (!f.empty()) {
invoker = f.invoker; invoker = f.invoker;
manager = f.manager; manager = f.manager;
functor = f.manager(f.functor, detail::function::clone_functor); functor = f.manager(f.functor, detail::function::clone_functor_tag);
} }
} }
@ -424,7 +358,7 @@ namespace boost {
functor = manager(detail::function::any_pointer( functor = manager(detail::function::any_pointer(
reinterpret_cast<void (*)()>(f) reinterpret_cast<void (*)()>(f)
), ),
detail::function::clone_functor); detail::function::clone_functor_tag);
} }
} }
@ -432,28 +366,7 @@ namespace boost {
template<typename MemberPtr> template<typename MemberPtr>
void assign_to(MemberPtr f, detail::function::member_ptr_tag) void assign_to(MemberPtr f, detail::function::member_ptr_tag)
{ {
clear(); this->assign_to(mem_fn(f));
if (f) {
typedef void (detail::function::any_pointer::container::
*stored_mem_func_type)();
typedef
typename detail::function::BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER<
MemberPtr,
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>::type
invoker_type;
invoker = &invoker_type::invoke;
manager = &detail::function::functor_manager<MemberPtr,
Allocator>::manage;
// Was a reinterpret_cast<>, but not all compilers handle it
functor = manager(detail::function::any_pointer(
(stored_mem_func_type)(f)
),
detail::function::clone_functor);
}
} }
#endif // BOOST_FUNCTION_NUM_ARGS > 0 #endif // BOOST_FUNCTION_NUM_ARGS > 0
@ -474,7 +387,7 @@ namespace boost {
Allocator>::manage; Allocator>::manage;
functor = functor =
manager(detail::function::any_pointer(const_cast<FunctionObj*>(&f)), manager(detail::function::any_pointer(const_cast<FunctionObj*>(&f)),
detail::function::clone_functor); detail::function::clone_functor_tag);
} }
} }
@ -516,8 +429,6 @@ namespace boost {
#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER #undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER #undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER #undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
#undef BOOST_FUNCTION_MEM_FUNCTION_INVOKER
#undef BOOST_FUNCTION_VOID_MEM_FUNCTION_INVOKER
#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER #undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER #undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
#undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER #undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER

1
test/function_n_test.cpp
View File

@ -584,6 +584,7 @@ struct X {
static void static void
test_member_functions() test_member_functions()
{ {
boost::function1<int, X*> f1(&X::twice); boost::function1<int, X*> f1(&X::twice);
X one(1); X one(1);