Merge pull request #25 from mauropasse/mauro-irobot/add-events-executor

iRobot ROS · web-flow · commit 2259a6706f2b · 2020-10-20T16:02:48.000+01:00
Rename ExecutorEventCallback -&gt; EventsExecutorCallback
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,
-    ExecutorEventCallback executor_callback) const;
+    EventsExecutorCallback executor_callback) const;
 
   RCLCPP_PUBLIC
   void
diff --git a/rclcpp/include/rclcpp/executors/events_executor_notify_waitable.hpp b/rclcpp/include/rclcpp/executors/events_executor_notify_waitable.hpp
@@ -64,7 +64,7 @@ class EventsExecutorNotifyWaitable final : public EventWaitable
   void
   set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
-    ExecutorEventCallback executor_callback) const override
+    EventsExecutorCallback executor_callback) const override
   {
     for (auto gc : notify_guard_conditions_) {
       rcl_ret_t ret = rcl_guard_condition_set_events_executor_callback(
diff --git a/rclcpp/include/rclcpp/experimental/subscription_intra_process_base.hpp b/rclcpp/include/rclcpp/experimental/subscription_intra_process_base.hpp
@@ -74,7 +74,7 @@ class SubscriptionIntraProcessBase : public rclcpp::Waitable
   void
   set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
-    ExecutorEventCallback executor_callback) const override;
+    EventsExecutorCallback 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
@@ -110,7 +110,7 @@ class QOSEventHandlerBase : public Waitable
   void
   set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
-    ExecutorEventCallback executor_callback) const override;
+    EventsExecutorCallback 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,
-    ExecutorEventCallback executor_callback) const;
+    EventsExecutorCallback executor_callback) const;
 
   RCLCPP_PUBLIC
   void
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,
-    ExecutorEventCallback executor_callback) const;
+    EventsExecutorCallback executor_callback) const;
 
   RCLCPP_PUBLIC
   void
diff --git a/rclcpp/include/rclcpp/waitable.hpp b/rclcpp/include/rclcpp/waitable.hpp
@@ -176,7 +176,7 @@ class Waitable
   void
   set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
-    ExecutorEventCallback executor_callback) const;
+    EventsExecutorCallback executor_callback) const;
 
   RCLCPP_PUBLIC
   void
diff --git a/rclcpp/src/rclcpp/client.cpp b/rclcpp/src/rclcpp/client.cpp
@@ -205,7 +205,7 @@ ClientBase::exchange_in_use_by_wait_set_state(bool in_use_state)
 void
 ClientBase::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
-  ExecutorEventCallback executor_callback) const
+  EventsExecutorCallback executor_callback) const
 {
   rcl_ret_t ret = rcl_client_set_events_executor_callback(
     executor,
diff --git a/rclcpp/src/rclcpp/qos_event.cpp b/rclcpp/src/rclcpp/qos_event.cpp
@@ -75,7 +75,7 @@ QOSEventHandlerBase::is_ready(rcl_wait_set_t * wait_set)
 void
 QOSEventHandlerBase::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
-  ExecutorEventCallback executor_callback) const
+  EventsExecutorCallback executor_callback) const
 {
   rcl_ret_t ret = rcl_event_set_events_executor_callback(
     executor,
diff --git a/rclcpp/src/rclcpp/service.cpp b/rclcpp/src/rclcpp/service.cpp
@@ -92,7 +92,7 @@ ServiceBase::exchange_in_use_by_wait_set_state(bool in_use_state)
 void
 ServiceBase::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
-  ExecutorEventCallback executor_callback) const
+  EventsExecutorCallback executor_callback) const
 {
   rcl_ret_t ret = rcl_service_set_events_executor_callback(
     executor,
diff --git a/rclcpp/src/rclcpp/subscription_base.cpp b/rclcpp/src/rclcpp/subscription_base.cpp
@@ -296,7 +296,7 @@ SubscriptionBase::exchange_in_use_by_wait_set_state(
 void
 SubscriptionBase::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
-  ExecutorEventCallback executor_callback) const
+  EventsExecutorCallback executor_callback) const
 {
   rcl_ret_t ret = rcl_subscription_set_events_executor_callback(
     executor,
diff --git a/rclcpp/src/rclcpp/subscription_intra_process_base.cpp b/rclcpp/src/rclcpp/subscription_intra_process_base.cpp
@@ -47,7 +47,7 @@ SubscriptionIntraProcessBase::get_actual_qos() const
 void
 SubscriptionIntraProcessBase::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
-  ExecutorEventCallback executor_callback) const
+  EventsExecutorCallback executor_callback) const
 {
   rcl_ret_t ret = rcl_guard_condition_set_events_executor_callback(
     executor,
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,
-  ExecutorEventCallback executor_callback) const
+  EventsExecutorCallback 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
@@ -462,7 +462,7 @@ class TestWaitable : public rclcpp::Waitable
   void
   set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
-    ExecutorEventCallback executor_callback) const override
+    EventsExecutorCallback executor_callback) const override
   {
     rcl_ret_t ret = rcl_guard_condition_set_events_executor_callback(
       executor,

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class EventsExecutorNotifyWaitable final : public EventWaitable`
`64`	`64`	`void`
`65`	`65`	`set_events_executor_callback(`
`66`	`66`	`const rclcpp::executors::EventsExecutor * executor,`
`67`		`- ExecutorEventCallback executor_callback) const override`
	`67`	`+ EventsExecutorCallback executor_callback) const override`
`68`	`68`	`{`
`69`	`69`	`for (auto gc : notify_guard_conditions_) {`
`70`	`70`	`rcl_ret_t ret = rcl_guard_condition_set_events_executor_callback(`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ ClientBase::exchange_in_use_by_wait_set_state(bool in_use_state)`
`205`	`205`	`void`
`206`	`206`	`ClientBase::set_events_executor_callback(`
`207`	`207`	`const rclcpp::executors::EventsExecutor * executor,`
`208`		`- ExecutorEventCallback executor_callback) const`
	`208`	`+ EventsExecutorCallback executor_callback) const`
`209`	`209`	`{`
`210`	`210`	`rcl_ret_t ret = rcl_client_set_events_executor_callback(`
`211`	`211`	`executor,`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ QOSEventHandlerBase::is_ready(rcl_wait_set_t * wait_set)`
`75`	`75`	`void`
`76`	`76`	`QOSEventHandlerBase::set_events_executor_callback(`
`77`	`77`	`const rclcpp::executors::EventsExecutor * executor,`
`78`		`- ExecutorEventCallback executor_callback) const`
	`78`	`+ EventsExecutorCallback executor_callback) const`
`79`	`79`	`{`
`80`	`80`	`rcl_ret_t ret = rcl_event_set_events_executor_callback(`
`81`	`81`	`executor,`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ ServiceBase::exchange_in_use_by_wait_set_state(bool in_use_state)`
`92`	`92`	`void`
`93`	`93`	`ServiceBase::set_events_executor_callback(`
`94`	`94`	`const rclcpp::executors::EventsExecutor * executor,`
`95`		`- ExecutorEventCallback executor_callback) const`
	`95`	`+ EventsExecutorCallback executor_callback) const`
`96`	`96`	`{`
`97`	`97`	`rcl_ret_t ret = rcl_service_set_events_executor_callback(`
`98`	`98`	`executor,`