From 59cccfe83f19cc55a4e258434a6d50fea249c404 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Thu, 1 Apr 2021 21:00:20 -0700 Subject: [PATCH] refactor to remove listener term Signed-off-by: William Woodall --- rmw_implementation/src/functions.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/rmw_implementation/src/functions.cpp b/rmw_implementation/src/functions.cpp index 405e5a1f..b04aa1a0 100644 --- a/rmw_implementation/src/functions.cpp +++ b/rmw_implementation/src/functions.cpp @@ -610,28 +610,28 @@ RMW_INTERFACE_FN( size_t)) RMW_INTERFACE_FN( - rmw_subscription_set_listener_callback, + rmw_subscription_set_on_new_message_callback, rmw_ret_t, RMW_RET_ERROR, 3, ARG_TYPES( - rmw_subscription_t *, rmw_listener_callback_t, const void *)) + rmw_subscription_t *, rmw_event_callback_t, const void *)) RMW_INTERFACE_FN( - rmw_service_set_listener_callback, + rmw_service_set_on_new_request_callback, rmw_ret_t, RMW_RET_ERROR, 3, ARG_TYPES( - rmw_service_t *, rmw_listener_callback_t, const void *)) + rmw_service_t *, rmw_event_callback_t, const void *)) RMW_INTERFACE_FN( - rmw_client_set_listener_callback, + rmw_client_set_on_new_response_callback, rmw_ret_t, RMW_RET_ERROR, 3, ARG_TYPES( - rmw_client_t *, rmw_listener_callback_t, const void *)) + rmw_client_t *, rmw_event_callback_t, const void *)) RMW_INTERFACE_FN( - rmw_event_set_listener_callback, + rmw_event_set_callback, rmw_ret_t, RMW_RET_ERROR, 3, ARG_TYPES( - rmw_event_t *, rmw_listener_callback_t, const void *)) + rmw_event_t *, rmw_event_callback_t, const void *)) #define GET_SYMBOL(x) symbol_ ## x = get_symbol(#x); @@ -711,10 +711,10 @@ void prefetch_symbols(void) GET_SYMBOL(rmw_get_publishers_info_by_topic) GET_SYMBOL(rmw_get_subscriptions_info_by_topic) GET_SYMBOL(rmw_qos_profile_check_compatible) - GET_SYMBOL(rmw_subscription_set_listener_callback) - GET_SYMBOL(rmw_service_set_listener_callback) - GET_SYMBOL(rmw_client_set_listener_callback) - GET_SYMBOL(rmw_event_set_listener_callback) + GET_SYMBOL(rmw_subscription_set_on_new_message_callback) + GET_SYMBOL(rmw_service_set_on_new_request_callback) + GET_SYMBOL(rmw_client_set_on_new_response_callback) + GET_SYMBOL(rmw_event_set_callback) } void * symbol_rmw_init = nullptr;