From 4ba8c23ce4530c1d019680da6f52c24aa3c12fe4 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 28 Jan 2024 02:31:14 +0200 Subject: [PATCH] Remove uses of BOOST_FUNCTION_VOID_FUNCTION_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 f6695f1..063798d 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_INVOKER void_function_invoker #define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER function_obj_invoker #define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER void_function_obj_invoker #define BOOST_FUNCTION_FUNCTION_REF_INVOKER function_ref_invoker @@ -67,7 +66,7 @@ namespace boost { typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS > - struct BOOST_FUNCTION_VOID_FUNCTION_INVOKER + struct void_function_invoker { static BOOST_FUNCTION_VOID_RETURN_TYPE invoke(function_buffer& function_ptr BOOST_FUNCTION_COMMA @@ -201,7 +200,7 @@ namespace boost { struct BOOST_FUNCTION_GET_FUNCTION_INVOKER { typedef typename conditional<(is_void::value), - BOOST_FUNCTION_VOID_FUNCTION_INVOKER< + void_function_invoker< FunctionPtr, R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS @@ -1079,7 +1078,6 @@ public: // Cleanup after ourselves... #undef BOOST_FUNCTION_VTABLE #undef BOOST_FUNCTION_COMMA -#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER #undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER #undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER #undef BOOST_FUNCTION_FUNCTION_REF_INVOKER