From 4cedf0bf3b61c572d46d4d87b440154db183b35a Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 28 Jan 2024 02:35:01 +0200 Subject: [PATCH] Remove uses of BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER --- include/boost/function/function_template.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp index 08fd3c1..748770e 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_VOID_FUNCTION_REF_INVOKER void_function_ref_invoker #define BOOST_FUNCTION_MEMBER_INVOKER function_mem_invoker #define BOOST_FUNCTION_VOID_MEMBER_INVOKER function_void_mem_invoker #define BOOST_FUNCTION_GET_FUNCTION_INVOKER get_function_invoker @@ -138,7 +137,7 @@ namespace boost { typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS > - struct BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER + struct void_function_ref_invoker { static BOOST_FUNCTION_VOID_RETURN_TYPE invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA @@ -239,7 +238,7 @@ namespace boost { struct BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER { typedef typename conditional<(is_void::value), - BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER< + void_function_ref_invoker< FunctionObj, R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS @@ -1075,7 +1074,6 @@ public: // Cleanup after ourselves... #undef BOOST_FUNCTION_VTABLE #undef BOOST_FUNCTION_COMMA -#undef BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER #undef BOOST_FUNCTION_MEMBER_INVOKER #undef BOOST_FUNCTION_VOID_MEMBER_INVOKER #undef BOOST_FUNCTION_GET_FUNCTION_INVOKER