From 916b44374dc7f46ca8dde9bc184df29d964f5ed8 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 28 Jan 2024 03:00:17 +0200 Subject: [PATCH] Remove uses of BOOST_FUNCTION_GET_INVOKER --- include/boost/function/function_template.hpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp index 2856485..9b3af0d 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_INVOKER get_invoker #define BOOST_FUNCTION_VTABLE basic_vtable #define BOOST_FUNCTION_VOID_RETURN_TYPE void @@ -279,11 +278,11 @@ namespace boost { contains two typedefs, "invoker_type" and "manager_type", which correspond to the invoker and manager types. */ template - struct BOOST_FUNCTION_GET_INVOKER { }; + struct get_invoker { }; /* Retrieve the invoker for a function pointer. */ template<> - struct BOOST_FUNCTION_GET_INVOKER + struct get_invoker { template @@ -317,7 +316,7 @@ namespace boost { #if BOOST_FUNCTION_NUM_ARGS > 0 /* Retrieve the invoker for a member pointer. */ template<> - struct BOOST_FUNCTION_GET_INVOKER + struct get_invoker { template @@ -351,7 +350,7 @@ namespace boost { /* Retrieve the invoker for a function object. */ template<> - struct BOOST_FUNCTION_GET_INVOKER + struct get_invoker { template @@ -384,7 +383,7 @@ namespace boost { /* Retrieve the invoker for a reference to a function object. */ template<> - struct BOOST_FUNCTION_GET_INVOKER + struct get_invoker { template @@ -833,7 +832,7 @@ namespace boost { using boost::detail::function::vtable_base; typedef typename boost::detail::function::get_function_tag::type tag; - typedef boost::detail::function::BOOST_FUNCTION_GET_INVOKER get_invoker; + typedef boost::detail::function::get_invoker get_invoker; typedef typename get_invoker:: template apply @@ -867,7 +866,7 @@ namespace boost { using boost::detail::function::vtable_base; typedef typename boost::detail::function::get_function_tag::type tag; - typedef boost::detail::function::BOOST_FUNCTION_GET_INVOKER get_invoker; + typedef boost::detail::function::get_invoker get_invoker; typedef typename get_invoker:: template apply_a @@ -1068,7 +1067,6 @@ public: // Cleanup after ourselves... #undef BOOST_FUNCTION_VTABLE #undef BOOST_FUNCTION_COMMA -#undef BOOST_FUNCTION_GET_INVOKER #undef BOOST_FUNCTION_TEMPLATE_PARMS #undef BOOST_FUNCTION_TEMPLATE_ARGS #undef BOOST_FUNCTION_PARMS