From 87d8b29dc0fd612027abcb572479cb5127666ffb Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 28 Jan 2024 02:59:36 +0200 Subject: [PATCH] Remove uses of BOOST_FUNCTION_GET_MEMBER_INVOKER --- include/boost/function/function_template.hpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp index 3cdbdc0..2856485 100644 --- a/include/boost/function/function_template.hpp +++ b/include/boost/function/function_template.hpp @@ -27,7 +27,6 @@ #define BOOST_FUNCTION_COMMA , // 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_VTABLE basic_vtable @@ -253,7 +252,7 @@ namespace boost { typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS > - struct BOOST_FUNCTION_GET_MEMBER_INVOKER + struct get_member_invoker { typedef typename conditional<(is_void::value), void_member_invoker< @@ -324,7 +323,7 @@ namespace boost { typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS> struct apply { - typedef typename BOOST_FUNCTION_GET_MEMBER_INVOKER< + typedef typename get_member_invoker< MemberPtr, R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS @@ -338,7 +337,7 @@ namespace boost { typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS> struct apply_a { - typedef typename BOOST_FUNCTION_GET_MEMBER_INVOKER< + typedef typename get_member_invoker< MemberPtr, R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS @@ -1069,7 +1068,6 @@ public: // Cleanup after ourselves... #undef BOOST_FUNCTION_VTABLE #undef BOOST_FUNCTION_COMMA -#undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER #undef BOOST_FUNCTION_GET_INVOKER #undef BOOST_FUNCTION_TEMPLATE_PARMS #undef BOOST_FUNCTION_TEMPLATE_ARGS