Skip to content

Add preprocessor logic to preserve compatibility with Foxy in master #197

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

Closed
wants to merge 1 commit into from
Closed

Add preprocessor logic to preserve compatibility with Foxy in master #197

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
6 changes: 4 additions & 2 deletions rmw_cyclonedds_cpp/src/rmw_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2495,7 +2495,9 @@ static const std::unordered_map<rmw_event_type_t, uint32_t> mask_map{
{RMW_EVENT_OFFERED_DEADLINE_MISSED, DDS_OFFERED_DEADLINE_MISSED_STATUS},
{RMW_EVENT_REQUESTED_QOS_INCOMPATIBLE, DDS_REQUESTED_INCOMPATIBLE_QOS_STATUS},
{RMW_EVENT_OFFERED_QOS_INCOMPATIBLE, DDS_OFFERED_INCOMPATIBLE_QOS_STATUS},
#if RMW_VERSION_GTE(1, 1, 0)
{RMW_EVENT_MESSAGE_LOST, DDS_SAMPLE_LOST_STATUS},
#endif
};

static bool is_event_supported(const rmw_event_type_t event_t)
Expand Down Expand Up @@ -2603,7 +2605,7 @@ extern "C" rmw_ret_t rmw_take_event(
return RMW_RET_OK;
}
}

#if RMW_VERSION_GTE(1, 1, 0)
case RMW_EVENT_MESSAGE_LOST: {
auto ei = static_cast<rmw_message_lost_status_t *>(event_info);
auto sub = static_cast<CddsSubscription *>(event_handle->data);
Expand All @@ -2617,7 +2619,7 @@ extern "C" rmw_ret_t rmw_take_event(
*taken = true;
return RMW_RET_OK;
}

#endif
case RMW_EVENT_LIVELINESS_LOST: {
auto ei = static_cast<rmw_liveliness_lost_status_t *>(event_info);
auto pub = static_cast<CddsPublisher *>(event_handle->data);
Expand Down