Merge pull request ros2#5 from irobot-ros/revert-4-mauro-irobot/add-e…

…vents-executor Revert "void return on set_events_executor_callback"
mauropasse · Oct 14, 2020 · 7396459 · 7396459
2 parents 0688345 + 492767a
commit 7396459
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 20 deletions.
diff --git a/rmw_fastrtps_cpp/src/rmw_client.cpp b/rmw_fastrtps_cpp/src/rmw_client.cpp
@@ -333,14 +333,14 @@ rmw_destroy_client(rmw_node_t * node, rmw_client_t * client)
     eprosima_fastrtps_identifier, node, client);
 }
 
-void
+rmw_ret_t
 rmw_client_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
   const void * client_handle,
   void * rmw_client)
 {
-  rmw_fastrtps_shared_cpp::__rmw_client_set_events_executor_callback(
+  return rmw_fastrtps_shared_cpp::__rmw_client_set_events_executor_callback(
     executor_context,
     callback,
     client_handle,

diff --git a/rmw_fastrtps_cpp/src/rmw_event.cpp b/rmw_fastrtps_cpp/src/rmw_event.cpp
@@ -48,15 +48,15 @@ rmw_subscription_event_init(
     event_type);
 }
 
-void
+rmw_ret_t
 rmw_event_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
   const void * event_handle,
   void * rmw_event,
   bool use_previous_events)
 {
-  rmw_fastrtps_shared_cpp::__rmw_event_set_events_executor_callback(
+  return rmw_fastrtps_shared_cpp::__rmw_event_set_events_executor_callback(
     executor_context,
     callback,
     event_handle,

diff --git a/rmw_fastrtps_cpp/src/rmw_guard_condition.cpp b/rmw_fastrtps_cpp/src/rmw_guard_condition.cpp
@@ -43,15 +43,15 @@ rmw_destroy_guard_condition(rmw_guard_condition_t * guard_condition)
     guard_condition);
 }
 
-void
+rmw_ret_t
 rmw_guard_condition_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
   const void * guard_condition_handle,
   void * rmw_guard_condition,
   bool use_previous_events)
 {
-  rmw_fastrtps_shared_cpp::__rmw_guard_condition_set_events_executor_callback(
+  return rmw_fastrtps_shared_cpp::__rmw_guard_condition_set_events_executor_callback(
     executor_context,
     callback,
     guard_condition_handle,

diff --git a/rmw_fastrtps_cpp/src/rmw_service.cpp b/rmw_fastrtps_cpp/src/rmw_service.cpp
@@ -339,14 +339,14 @@ rmw_destroy_service(rmw_node_t * node, rmw_service_t * service)
     eprosima_fastrtps_identifier, node, service);
 }
 
-void
+rmw_ret_t
 rmw_service_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
   const void * service_handle,
   void * rmw_service)
 {
-  rmw_fastrtps_shared_cpp::__rmw_service_set_events_executor_callback(
+  return rmw_fastrtps_shared_cpp::__rmw_service_set_events_executor_callback(
     executor_context,
     callback,
     service_handle,

diff --git a/rmw_fastrtps_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_cpp/src/rmw_subscription.cpp
@@ -168,14 +168,14 @@ rmw_destroy_subscription(rmw_node_t * node, rmw_subscription_t * subscription)
     eprosima_fastrtps_identifier, node, subscription);
 }
 
-void
+rmw_ret_t
 rmw_subscription_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
   const void * subscription_handle,
   void * rmw_subscription)
 {
-  rmw_fastrtps_shared_cpp::__rmw_subscription_set_events_executor_callback(
+  return rmw_fastrtps_shared_cpp::__rmw_subscription_set_events_executor_callback(
     executor_context,
     callback,
     subscription_handle,

diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/rmw_common.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/rmw_common.hpp
@@ -393,31 +393,31 @@ __rmw_get_subscriptions_info_by_topic(
   rmw_topic_endpoint_info_array_t * subscriptions_info);
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
-void
+rmw_ret_t
 __rmw_subscription_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
   const void * subscription_handle,
   void * rmw_subscription);
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
-void
+rmw_ret_t
 __rmw_service_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
   const void * service_handle,
   void * rmw_service);
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
-void
+rmw_ret_t
 __rmw_client_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
   const void * client_handle,
   void * rmw_client);
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
-void
+rmw_ret_t
 __rmw_guard_condition_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
@@ -426,7 +426,7 @@ __rmw_guard_condition_set_events_executor_callback(
   bool use_previous_events);
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
-void
+rmw_ret_t
 __rmw_event_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_client.cpp b/rmw_fastrtps_shared_cpp/src/rmw_client.cpp
@@ -81,7 +81,7 @@ __rmw_destroy_client(
   return ret;
 }
 
-void
+rmw_ret_t
 __rmw_client_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
@@ -93,5 +93,6 @@ __rmw_client_set_events_executor_callback(
     executor_context,
     callback,
     client_handle);
+  return RMW_RET_OK;
 }
 }  // namespace rmw_fastrtps_shared_cpp
diff --git a/rmw_fastrtps_shared_cpp/src/rmw_event.cpp b/rmw_fastrtps_shared_cpp/src/rmw_event.cpp
@@ -68,7 +68,7 @@ __rmw_init_event(
   return RMW_RET_OK;
 }
 
-void
+rmw_ret_t
 __rmw_event_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
@@ -83,6 +83,7 @@ __rmw_event_set_events_executor_callback(
     callback,
     event_handle,
     use_previous_events);
+  return RMW_RET_OK;
 }
 
 }  // namespace rmw_fastrtps_shared_cpp
diff --git a/rmw_fastrtps_shared_cpp/src/rmw_guard_condition.cpp b/rmw_fastrtps_shared_cpp/src/rmw_guard_condition.cpp
@@ -47,7 +47,7 @@ __rmw_destroy_guard_condition(rmw_guard_condition_t * guard_condition)
   return ret;
 }
 
-void
+rmw_ret_t
 __rmw_guard_condition_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
@@ -61,5 +61,6 @@ __rmw_guard_condition_set_events_executor_callback(
     callback,
     guard_condition_handle,
     use_previous_events);
+  return RMW_RET_OK;
 }
 }  // namespace rmw_fastrtps_shared_cpp
diff --git a/rmw_fastrtps_shared_cpp/src/rmw_service.cpp b/rmw_fastrtps_shared_cpp/src/rmw_service.cpp
@@ -94,7 +94,7 @@ __rmw_destroy_service(
   return ret;
 }
 
-void
+rmw_ret_t
 __rmw_service_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
@@ -106,5 +106,6 @@ __rmw_service_set_events_executor_callback(
     executor_context,
     callback,
     service_handle);
+  return RMW_RET_OK;
 }
 }  // namespace rmw_fastrtps_shared_cpp
diff --git a/rmw_fastrtps_shared_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_shared_cpp/src/rmw_subscription.cpp
@@ -107,7 +107,7 @@ __rmw_subscription_get_actual_qos(
   return RMW_RET_OK;
 }
 
-void
+rmw_ret_t
 __rmw_subscription_set_events_executor_callback(
   const void * executor_context,
   ExecutorEventCallback callback,
@@ -119,5 +119,6 @@ __rmw_subscription_set_events_executor_callback(
     executor_context,
     callback,
     subscription_handle);
+  return RMW_RET_OK;
 }
 }  // namespace rmw_fastrtps_shared_cpp