From 89dfb032f29931358d57819edca15a7f02f10bb6 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 12 Oct 2024 21:58:15 +0300 Subject: [PATCH] Rename `apply` to `apply_` to avoid msvc-14.3 conflict. Fixes #53. --- include/boost/function/function_template.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp index f21a395b..ac4a5b24 100644 --- a/include/boost/function/function_template.hpp +++ b/include/boost/function/function_template.hpp @@ -261,9 +261,9 @@ namespace boost { actual invoker that will be used for the given function object. - Each specialization contains an "apply" nested class template + Each specialization contains an "apply_" nested class template that accepts the function object, return type, function - argument types, and allocator. The resulting "apply" class + argument types, and allocator. The resulting "apply_" class contains two typedefs, "invoker_type" and "manager_type", which correspond to the invoker and manager types. */ template @@ -275,7 +275,7 @@ namespace boost { { template - struct apply + struct apply_ { typedef typename get_function_invoker< FunctionPtr, @@ -308,7 +308,7 @@ namespace boost { { template - struct apply + struct apply_ { typedef typename get_member_invoker< MemberPtr, @@ -341,7 +341,7 @@ namespace boost { { template - struct apply + struct apply_ { typedef typename get_function_obj_invoker< FunctionObj, @@ -374,7 +374,7 @@ namespace boost { { template - struct apply + struct apply_ { typedef typename get_function_ref_invoker< typename RefWrapper::type, @@ -923,7 +923,7 @@ namespace boost { typedef typename boost::detail::function::get_function_tag::type tag; typedef boost::detail::function::get_invoker get_invoker; typedef typename get_invoker:: - template apply handler_type;