Skip to content

Commit 6b04608

Browse files
committed
Rename RMW type name to "incompatible type".
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
1 parent 1c9da87 commit 6b04608

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

rmw_cyclonedds_cpp/src/rmw_node.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ extern "C" rmw_ret_t rmw_event_set_callback(
718718
break;
719719
}
720720

721-
case RMW_EVENT_PUBLISHER_INCONSISTENT_TOPIC:
721+
case RMW_EVENT_PUBLISHER_INCOMPATIBLE_TYPE:
722722
{
723723
auto pub_event = static_cast<CddsPublisher *>(rmw_event->data);
724724
event_set_callback(
@@ -727,7 +727,7 @@ extern "C" rmw_ret_t rmw_event_set_callback(
727727
break;
728728
}
729729

730-
case RMW_EVENT_SUBSCRIPTION_INCONSISTENT_TOPIC:
730+
case RMW_EVENT_SUBSCRIPTION_INCOMPATIBLE_TYPE:
731731
{
732732
auto sub_event = static_cast<CddsSubscription *>(rmw_event->data);
733733
event_set_callback(
@@ -3647,8 +3647,8 @@ static const std::unordered_map<rmw_event_type_t, uint32_t> mask_map{
36473647
{RMW_EVENT_REQUESTED_QOS_INCOMPATIBLE, DDS_REQUESTED_INCOMPATIBLE_QOS_STATUS},
36483648
{RMW_EVENT_OFFERED_QOS_INCOMPATIBLE, DDS_OFFERED_INCOMPATIBLE_QOS_STATUS},
36493649
{RMW_EVENT_MESSAGE_LOST, DDS_SAMPLE_LOST_STATUS},
3650-
{RMW_EVENT_PUBLISHER_INCONSISTENT_TOPIC, DDS_INCONSISTENT_TOPIC_STATUS},
3651-
{RMW_EVENT_SUBSCRIPTION_INCONSISTENT_TOPIC, DDS_INCONSISTENT_TOPIC_STATUS},
3650+
{RMW_EVENT_PUBLISHER_INCOMPATIBLE_TYPE, DDS_INCONSISTENT_TOPIC_STATUS},
3651+
{RMW_EVENT_SUBSCRIPTION_INCOMPATIBLE_TYPE, DDS_INCONSISTENT_TOPIC_STATUS},
36523652
};
36533653

36543654
static bool is_event_supported(const rmw_event_type_t event_t)
@@ -3821,8 +3821,8 @@ extern "C" rmw_ret_t rmw_take_event(
38213821
}
38223822
}
38233823

3824-
case RMW_EVENT_PUBLISHER_INCONSISTENT_TOPIC: {
3825-
auto it = static_cast<rmw_inconsistent_topic_status_t *>(event_info);
3824+
case RMW_EVENT_PUBLISHER_INCOMPATIBLE_TYPE: {
3825+
auto it = static_cast<rmw_incompatible_type_status_t *>(event_info);
38263826
auto pub = static_cast<CddsPublisher *>(event_handle->data);
38273827

38283828
const dds_entity_t topic = dds_get_topic(pub->enth);
@@ -3838,8 +3838,8 @@ extern "C" rmw_ret_t rmw_take_event(
38383838
}
38393839
}
38403840

3841-
case RMW_EVENT_SUBSCRIPTION_INCONSISTENT_TOPIC: {
3842-
auto it = static_cast<rmw_inconsistent_topic_status_t *>(event_info);
3841+
case RMW_EVENT_SUBSCRIPTION_INCOMPATIBLE_TYPE: {
3842+
auto it = static_cast<rmw_incompatible_type_status_t *>(event_info);
38433843
auto sub = static_cast<CddsSubscription *>(event_handle->data);
38443844

38453845
const dds_entity_t topic = dds_get_topic(sub->enth);

0 commit comments

Comments
 (0)