fix: Fixed compilation after API change of TimerBase::execute (#375)

Signed-off-by: Janosch Machowinski <[email protected]> Co-authored-by: Janosch Machowinski <[email protected]>
ros2 · Apr 12, 2024 · 2e22a55 · 2e22a55
1 parent b94c739
commit 2e22a55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/rclcpp/topics/minimal_subscriber/time_triggered_wait_set_subscriber.cpp b/rclcpp/topics/minimal_subscriber/time_triggered_wait_set_subscriber.cpp
@@ -71,7 +71,9 @@ class TimeTriggeredWaitSetSubscriber : public rclcpp::Node
         case rclcpp::WaitResultKind::Ready:
           {
             if (wait_result.get_wait_set().get_rcl_wait_set().timers[0U]) {
-              timer_->execute_callback();
+              if (auto data = timer_->call()) {
+                timer_->execute_callback(data);
+              }
             }
             break;
           }

diff --git a/rclcpp/wait_set/src/wait_set_topics_and_timer.cpp b/rclcpp/wait_set/src/wait_set_topics_and_timer.cpp
@@ -71,8 +71,10 @@ int32_t main(const int32_t argc, char ** const argv)
     const auto wait_result = wait_set.wait(2s);
     if (wait_result.kind() == rclcpp::WaitResultKind::Ready) {
       if (wait_result.get_wait_set().get_rcl_wait_set().timers[0U]) {
-        // The timer callback is executed manually here
-        one_off_timer->execute_callback();
+        if (auto data = one_off_timer->call()) {
+          // The timer callback is executed manually here
+          one_off_timer->execute_callback(data);
+        }
       } else {
         std_msgs::msg::String msg;
         rclcpp::MessageInfo msg_info;