From 46e3b48ba8cebf67c4bfe32e243b98c018e54f93 Mon Sep 17 00:00:00 2001 From: Mauro Passerino Date: Mon, 8 Feb 2021 14:22:25 -0300 Subject: [PATCH] rename rmw_listener_cb_t->rmw_listener_callback_t --- rclcpp/include/rclcpp/client.hpp | 2 +- .../rclcpp/executors/events_executor_notify_waitable.hpp | 2 +- .../rclcpp/experimental/subscription_intra_process_base.hpp | 2 +- rclcpp/include/rclcpp/qos_event.hpp | 2 +- rclcpp/include/rclcpp/service.hpp | 2 +- rclcpp/include/rclcpp/subscription_base.hpp | 2 +- rclcpp/include/rclcpp/waitable.hpp | 2 +- rclcpp/src/rclcpp/client.cpp | 2 +- rclcpp/src/rclcpp/qos_event.cpp | 2 +- rclcpp/src/rclcpp/service.cpp | 2 +- rclcpp/src/rclcpp/subscription_base.cpp | 2 +- rclcpp/src/rclcpp/subscription_intra_process_base.cpp | 2 +- rclcpp/src/rclcpp/waitable.cpp | 2 +- rclcpp/test/rclcpp/executors/test_executors.cpp | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rclcpp/include/rclcpp/client.hpp b/rclcpp/include/rclcpp/client.hpp index 44b2724b7b..e5e7bd50a3 100644 --- a/rclcpp/include/rclcpp/client.hpp +++ b/rclcpp/include/rclcpp/client.hpp @@ -160,7 +160,7 @@ class ClientBase void set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const; + rmw_listener_callback_t executor_callback) const; protected: RCLCPP_DISABLE_COPY(ClientBase) diff --git a/rclcpp/include/rclcpp/executors/events_executor_notify_waitable.hpp b/rclcpp/include/rclcpp/executors/events_executor_notify_waitable.hpp index ee7ed4a6dc..3e868314ab 100644 --- a/rclcpp/include/rclcpp/executors/events_executor_notify_waitable.hpp +++ b/rclcpp/include/rclcpp/executors/events_executor_notify_waitable.hpp @@ -62,7 +62,7 @@ class EventsExecutorNotifyWaitable final : public EventWaitable void set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const override + rmw_listener_callback_t executor_callback) const override { for (auto gc : notify_guard_conditions_) { rcl_ret_t ret = rcl_guard_condition_set_listener_callback( diff --git a/rclcpp/include/rclcpp/experimental/subscription_intra_process_base.hpp b/rclcpp/include/rclcpp/experimental/subscription_intra_process_base.hpp index 4c5713f13b..cca9a6cc46 100644 --- a/rclcpp/include/rclcpp/experimental/subscription_intra_process_base.hpp +++ b/rclcpp/include/rclcpp/experimental/subscription_intra_process_base.hpp @@ -78,7 +78,7 @@ class SubscriptionIntraProcessBase : public rclcpp::Waitable void set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const override; + rmw_listener_callback_t executor_callback) const override; protected: std::recursive_mutex reentrant_mutex_; diff --git a/rclcpp/include/rclcpp/qos_event.hpp b/rclcpp/include/rclcpp/qos_event.hpp index 9afcecfbf0..4883c7f184 100644 --- a/rclcpp/include/rclcpp/qos_event.hpp +++ b/rclcpp/include/rclcpp/qos_event.hpp @@ -112,7 +112,7 @@ class QOSEventHandlerBase : public Waitable void set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const override; + rmw_listener_callback_t executor_callback) const override; protected: rcl_event_t event_handle_; diff --git a/rclcpp/include/rclcpp/service.hpp b/rclcpp/include/rclcpp/service.hpp index 8ffbef820f..35efd0cc8d 100644 --- a/rclcpp/include/rclcpp/service.hpp +++ b/rclcpp/include/rclcpp/service.hpp @@ -130,7 +130,7 @@ class ServiceBase void set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const; + rmw_listener_callback_t executor_callback) const; protected: RCLCPP_DISABLE_COPY(ServiceBase) diff --git a/rclcpp/include/rclcpp/subscription_base.hpp b/rclcpp/include/rclcpp/subscription_base.hpp index 81d3be4bec..ea60a062cc 100644 --- a/rclcpp/include/rclcpp/subscription_base.hpp +++ b/rclcpp/include/rclcpp/subscription_base.hpp @@ -273,7 +273,7 @@ class SubscriptionBase : public std::enable_shared_from_this void set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const; + rmw_listener_callback_t executor_callback) const; protected: template diff --git a/rclcpp/include/rclcpp/waitable.hpp b/rclcpp/include/rclcpp/waitable.hpp index e4d61f1732..8e6608ee62 100644 --- a/rclcpp/include/rclcpp/waitable.hpp +++ b/rclcpp/include/rclcpp/waitable.hpp @@ -213,7 +213,7 @@ class Waitable void set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const; + rmw_listener_callback_t executor_callback) const; private: std::atomic in_use_by_wait_set_{false}; diff --git a/rclcpp/src/rclcpp/client.cpp b/rclcpp/src/rclcpp/client.cpp index 14f8e02b42..789919c0b6 100644 --- a/rclcpp/src/rclcpp/client.cpp +++ b/rclcpp/src/rclcpp/client.cpp @@ -202,7 +202,7 @@ ClientBase::exchange_in_use_by_wait_set_state(bool in_use_state) void ClientBase::set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const + rmw_listener_callback_t executor_callback) const { rcl_ret_t ret = rcl_client_set_listener_callback( client_handle_.get(), diff --git a/rclcpp/src/rclcpp/qos_event.cpp b/rclcpp/src/rclcpp/qos_event.cpp index 1fbfa6559c..82b4ed7eb9 100644 --- a/rclcpp/src/rclcpp/qos_event.cpp +++ b/rclcpp/src/rclcpp/qos_event.cpp @@ -71,7 +71,7 @@ QOSEventHandlerBase::is_ready(rcl_wait_set_t * wait_set) void QOSEventHandlerBase::set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const + rmw_listener_callback_t executor_callback) const { rcl_ret_t ret = rcl_event_set_listener_callback( &event_handle_, diff --git a/rclcpp/src/rclcpp/service.cpp b/rclcpp/src/rclcpp/service.cpp index 506370325a..766de70826 100644 --- a/rclcpp/src/rclcpp/service.cpp +++ b/rclcpp/src/rclcpp/service.cpp @@ -88,7 +88,7 @@ ServiceBase::exchange_in_use_by_wait_set_state(bool in_use_state) void ServiceBase::set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const + rmw_listener_callback_t executor_callback) const { rcl_ret_t ret = rcl_service_set_listener_callback( service_handle_.get(), diff --git a/rclcpp/src/rclcpp/subscription_base.cpp b/rclcpp/src/rclcpp/subscription_base.cpp index e266a3d612..0eb2b3a62e 100644 --- a/rclcpp/src/rclcpp/subscription_base.cpp +++ b/rclcpp/src/rclcpp/subscription_base.cpp @@ -292,7 +292,7 @@ SubscriptionBase::exchange_in_use_by_wait_set_state( void SubscriptionBase::set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const + rmw_listener_callback_t executor_callback) const { rcl_ret_t ret = rcl_subscription_set_listener_callback( subscription_handle_.get(), diff --git a/rclcpp/src/rclcpp/subscription_intra_process_base.cpp b/rclcpp/src/rclcpp/subscription_intra_process_base.cpp index 3aa9dc22b3..876e73ff8b 100644 --- a/rclcpp/src/rclcpp/subscription_intra_process_base.cpp +++ b/rclcpp/src/rclcpp/subscription_intra_process_base.cpp @@ -40,7 +40,7 @@ SubscriptionIntraProcessBase::get_actual_qos() const void SubscriptionIntraProcessBase::set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const + rmw_listener_callback_t executor_callback) const { rcl_ret_t ret = rcl_guard_condition_set_listener_callback( &gc_, diff --git a/rclcpp/src/rclcpp/waitable.cpp b/rclcpp/src/rclcpp/waitable.cpp index e30ff05f4e..040716c40f 100644 --- a/rclcpp/src/rclcpp/waitable.cpp +++ b/rclcpp/src/rclcpp/waitable.cpp @@ -63,7 +63,7 @@ Waitable::exchange_in_use_by_wait_set_state(bool in_use_state) void Waitable::set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const + rmw_listener_callback_t executor_callback) const { (void)executor; (void)executor_callback; diff --git a/rclcpp/test/rclcpp/executors/test_executors.cpp b/rclcpp/test/rclcpp/executors/test_executors.cpp index a8393974d7..bbb68298ee 100644 --- a/rclcpp/test/rclcpp/executors/test_executors.cpp +++ b/rclcpp/test/rclcpp/executors/test_executors.cpp @@ -470,7 +470,7 @@ class TestWaitable : public rclcpp::Waitable void set_events_executor_callback( const rclcpp::executors::EventsExecutor * executor, - rmw_listener_cb_t executor_callback) const override + rmw_listener_callback_t executor_callback) const override { rcl_ret_t ret = rcl_guard_condition_set_listener_callback( &gc_,