Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2024
+7 −3
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion rclcpp/topics/minimal_subscriber/time_triggered_wait_set_subscriber.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 4 additions & 2 deletions rclcpp/wait_set/src/wait_set_topics_and_timer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down