Merge pull request #12 from mauropasse/mauro/group-callback-data

Rework executor callback data
ros2 · Feb 26, 2021 · 9475e03 · 9475e03
2 parents a85bf4f + eb43f00
commit 9475e03
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/rmw_implementation/src/functions.cpp b/rmw_implementation/src/functions.cpp
@@ -602,32 +602,32 @@ RMW_INTERFACE_FN(
 RMW_INTERFACE_FN(
   rmw_subscription_set_listener_callback,
   rmw_ret_t, RMW_RET_ERROR,
-  4, ARG_TYPES(
-    rmw_subscription_t *, rmw_listener_callback_t, void *, const void *))
+  3, ARG_TYPES(
+    rmw_subscription_t *, rmw_listener_callback_t, const void *))
 
 RMW_INTERFACE_FN(
   rmw_service_set_listener_callback,
   rmw_ret_t, RMW_RET_ERROR,
-  4, ARG_TYPES(
-    rmw_service_t *, rmw_listener_callback_t, void *, const void *))
+  3, ARG_TYPES(
+    rmw_service_t *, rmw_listener_callback_t, const void *))
 
 RMW_INTERFACE_FN(
   rmw_client_set_listener_callback,
   rmw_ret_t, RMW_RET_ERROR,
-  4, ARG_TYPES(
-    rmw_client_t *, rmw_listener_callback_t, void *, const void *))
+  3, ARG_TYPES(
+    rmw_client_t *, rmw_listener_callback_t, const void *))
 
 RMW_INTERFACE_FN(
   rmw_guard_condition_set_listener_callback,
   rmw_ret_t, RMW_RET_ERROR,
-  5, ARG_TYPES(
-    rmw_guard_condition_t *, rmw_listener_callback_t, void *, const void *, bool))
+  4, ARG_TYPES(
+    rmw_guard_condition_t *, rmw_listener_callback_t, const void *, bool))
 
 RMW_INTERFACE_FN(
   rmw_event_set_listener_callback,
   rmw_ret_t, RMW_RET_ERROR,
-  5, ARG_TYPES(
-    rmw_event_t *, rmw_listener_callback_t, void *, const void *, bool))
+  4, ARG_TYPES(
+    rmw_event_t *, rmw_listener_callback_t, const void *, bool))
 
 #define GET_SYMBOL(x) symbol_ ## x = get_symbol(#x);