diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp index f8f9e8d..08fd3c1 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_FUNCTION_REF_INVOKER function_ref_invoker #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 @@ -122,7 +121,7 @@ namespace boost { typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS > - struct BOOST_FUNCTION_FUNCTION_REF_INVOKER + struct function_ref_invoker { static R invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA BOOST_FUNCTION_PARMS) @@ -245,7 +244,7 @@ namespace boost { R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS >, - BOOST_FUNCTION_FUNCTION_REF_INVOKER< + function_ref_invoker< FunctionObj, R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS @@ -1076,7 +1075,6 @@ public: // Cleanup after ourselves... #undef BOOST_FUNCTION_VTABLE #undef BOOST_FUNCTION_COMMA -#undef BOOST_FUNCTION_FUNCTION_REF_INVOKER #undef BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER #undef BOOST_FUNCTION_MEMBER_INVOKER #undef BOOST_FUNCTION_VOID_MEMBER_INVOKER