Merge pull request #41 from mauropasse/mauro/rename-data-type

iRobot ROS · web-flow · commit 3d7deb8bfffb · 2021-02-08T18:48:15.000Z
rename rmw_listener_cb_t-&gt;rmw_listener_callback_t
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -273,7 +273,7 @@ class SubscriptionBase : public std::enable_shared_from_this<SubscriptionBase>
   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<typename EventCallbackT>
diff --git 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<bool> in_use_by_wait_set_{false};
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_,

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class EventsExecutorNotifyWaitable final : public EventWaitable`
`62`	`62`	`void`
`63`	`63`	`set_events_executor_callback(`
`64`	`64`	`const rclcpp::executors::EventsExecutor * executor,`
`65`		`- rmw_listener_cb_t executor_callback) const override`
	`65`	`+ rmw_listener_callback_t executor_callback) const override`
`66`	`66`	`{`
`67`	`67`	`for (auto gc : notify_guard_conditions_) {`
`68`	`68`	`rcl_ret_t ret = rcl_guard_condition_set_listener_callback(`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ ClientBase::exchange_in_use_by_wait_set_state(bool in_use_state)`
`202`	`202`	`void`
`203`	`203`	`ClientBase::set_events_executor_callback(`
`204`	`204`	`const rclcpp::executors::EventsExecutor * executor,`
`205`		`- rmw_listener_cb_t executor_callback) const`
	`205`	`+ rmw_listener_callback_t executor_callback) const`
`206`	`206`	`{`
`207`	`207`	`rcl_ret_t ret = rcl_client_set_listener_callback(`
`208`	`208`	`client_handle_.get(),`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ QOSEventHandlerBase::is_ready(rcl_wait_set_t * wait_set)`
`71`	`71`	`void`
`72`	`72`	`QOSEventHandlerBase::set_events_executor_callback(`
`73`	`73`	`const rclcpp::executors::EventsExecutor * executor,`
`74`		`- rmw_listener_cb_t executor_callback) const`
	`74`	`+ rmw_listener_callback_t executor_callback) const`
`75`	`75`	`{`
`76`	`76`	`rcl_ret_t ret = rcl_event_set_listener_callback(`
`77`	`77`	`&event_handle_,`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ ServiceBase::exchange_in_use_by_wait_set_state(bool in_use_state)`
`88`	`88`	`void`
`89`	`89`	`ServiceBase::set_events_executor_callback(`
`90`	`90`	`const rclcpp::executors::EventsExecutor * executor,`
`91`		`- rmw_listener_cb_t executor_callback) const`
	`91`	`+ rmw_listener_callback_t executor_callback) const`
`92`	`92`	`{`
`93`	`93`	`rcl_ret_t ret = rcl_service_set_listener_callback(`
`94`	`94`	`service_handle_.get(),`