Remove uses of BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER

This commit is contained in:
Peter Dimov
2024-01-28 02:41:11 +02:00
parent 7b8bdda461
commit 691b765827

View File

@@ -27,7 +27,6 @@
#define BOOST_FUNCTION_COMMA , #define BOOST_FUNCTION_COMMA ,
// Class names used in this version of the code // Class names used in this version of the code
#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER get_function_obj_invoker
#define BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER get_function_ref_invoker #define BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER get_function_ref_invoker
#define BOOST_FUNCTION_GET_MEMBER_INVOKER get_member_invoker #define BOOST_FUNCTION_GET_MEMBER_INVOKER get_member_invoker
#define BOOST_FUNCTION_GET_INVOKER get_invoker #define BOOST_FUNCTION_GET_INVOKER get_invoker
@@ -211,7 +210,7 @@ namespace boost {
typename R BOOST_FUNCTION_COMMA typename R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_PARMS BOOST_FUNCTION_TEMPLATE_PARMS
> >
struct BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER struct get_function_obj_invoker
{ {
typedef typename conditional<(is_void<R>::value), typedef typename conditional<(is_void<R>::value),
void_function_obj_invoker< void_function_obj_invoker<
@@ -360,7 +359,7 @@ namespace boost {
typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS> typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
struct apply struct apply
{ {
typedef typename BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER< typedef typename get_function_obj_invoker<
FunctionObj, FunctionObj,
R BOOST_FUNCTION_COMMA R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS BOOST_FUNCTION_TEMPLATE_ARGS
@@ -374,7 +373,7 @@ namespace boost {
typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS> typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
struct apply_a struct apply_a
{ {
typedef typename BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER< typedef typename get_function_obj_invoker<
FunctionObj, FunctionObj,
R BOOST_FUNCTION_COMMA R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS BOOST_FUNCTION_TEMPLATE_ARGS
@@ -1071,7 +1070,6 @@ public:
// Cleanup after ourselves... // Cleanup after ourselves...
#undef BOOST_FUNCTION_VTABLE #undef BOOST_FUNCTION_VTABLE
#undef BOOST_FUNCTION_COMMA #undef BOOST_FUNCTION_COMMA
#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
#undef BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER #undef BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER
#undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER #undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER
#undef BOOST_FUNCTION_GET_INVOKER #undef BOOST_FUNCTION_GET_INVOKER