Remove uses of BOOST_FUNCTION_GET_MEMBER_INVOKER

This commit is contained in:
Peter Dimov
2024-01-28 02:59:36 +02:00
parent 7efb3be043
commit 87d8b29dc0

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_MEMBER_INVOKER get_member_invoker
#define BOOST_FUNCTION_GET_INVOKER get_invoker #define BOOST_FUNCTION_GET_INVOKER get_invoker
#define BOOST_FUNCTION_VTABLE basic_vtable #define BOOST_FUNCTION_VTABLE basic_vtable
@ -253,7 +252,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_MEMBER_INVOKER struct get_member_invoker
{ {
typedef typename conditional<(is_void<R>::value), typedef typename conditional<(is_void<R>::value),
void_member_invoker< void_member_invoker<
@ -324,7 +323,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_MEMBER_INVOKER< typedef typename get_member_invoker<
MemberPtr, MemberPtr,
R BOOST_FUNCTION_COMMA R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS BOOST_FUNCTION_TEMPLATE_ARGS
@ -338,7 +337,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_MEMBER_INVOKER< typedef typename get_member_invoker<
MemberPtr, MemberPtr,
R BOOST_FUNCTION_COMMA R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS BOOST_FUNCTION_TEMPLATE_ARGS
@ -1069,7 +1068,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_MEM_FUNCTION_INVOKER
#undef BOOST_FUNCTION_GET_INVOKER #undef BOOST_FUNCTION_GET_INVOKER
#undef BOOST_FUNCTION_TEMPLATE_PARMS #undef BOOST_FUNCTION_TEMPLATE_PARMS
#undef BOOST_FUNCTION_TEMPLATE_ARGS #undef BOOST_FUNCTION_TEMPLATE_ARGS