Skip to content

Fixed MSVC compile errors (backport #3135) #3173

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
skyegalaxy merged 1 commit into from
Jun 11, 2026
Merged

Fixed MSVC compile errors (backport #3135) #3173

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
5 changes: 5 additions & 0 deletions rclcpp/include/rclcpp/executors/events_cbg_executor/events_cbg_executor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ class EventsCBGExecutor : public rclcpp::Executor
void
spin(const std::function<void(const std::exception &)> & exception_handler);

RCLCPP_PUBLIC
void
spin_once(std::chrono::nanoseconds timeout = std::chrono::nanoseconds(-1)) override;

Expand All @@ -149,10 +150,12 @@ class EventsCBGExecutor : public rclcpp::Executor
/**
* @return true if work was available and executed
*/
RCLCPP_PUBLIC
bool collect_and_execute_ready_events(
std::chrono::nanoseconds max_duration,
bool recollect_if_no_work_available);

RCLCPP_PUBLIC
void
spin_all(std::chrono::nanoseconds max_duration) override;

Expand Down Expand Up @@ -240,6 +243,7 @@ class EventsCBGExecutor : public rclcpp::Executor
void
run(size_t this_thread_number, bool block_initially);

RCLCPP_PUBLIC
void
run(
size_t this_thread_number,
Expand Down Expand Up @@ -290,6 +294,7 @@ class EventsCBGExecutor : public rclcpp::Executor
*/
void trigger_callback_group_sync();

RCLCPP_PUBLIC
void spin_once_internal(std::chrono::nanoseconds timeout);

RCLCPP_DISABLE_COPY(EventsCBGExecutor)
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/src/rclcpp/executors/events_cbg_executor/timer_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ class TimerQueue
*/
bool remove_if_dropped(const TimerData * timer_data)
{
if (timer_data->rcl_ref.unique()) {
if (timer_data->rcl_ref.use_count() == 1) {
// clear on reset callback
if(rcl_timer_set_on_reset_callback(timer_data->rcl_ref.get(), nullptr,
nullptr) != RCL_RET_OK)
Expand Down