Skip to content

[21783] Regenerate types with latest Fast DDS-Gen v4.0.2 #5306

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
Oct 8, 2024
Merged

[21783] Regenerate types with latest Fast DDS-Gen v4.0.2 #5306

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
426 changes: 240 additions & 186 deletions include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp
View file
Open in desktop

Large diffs are not rendered by default.

96 changes: 66 additions & 30 deletions src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,15 +492,24 @@ class TypeLookup_getTypes_Result
{
bool ret_value {false};

if (m__d == x.m__d &&
selected_member_ == x.selected_member_)
if (x.selected_member_ == selected_member_)
{
switch (selected_member_)
if (0x0FFFFFFFu != selected_member_)
{
case 0x00000001:
ret_value = (m_result == x.m_result);
break;
if (x.m__d == m__d)
{
switch (selected_member_)
{
case 0x00000001:
ret_value = (x.m_result == m_result);
break;

}
}
}
else
{
ret_value = true;
}
}

Expand Down Expand Up @@ -1122,15 +1131,24 @@ class TypeLookup_getTypeDependencies_Result
{
bool ret_value {false};

if (m__d == x.m__d &&
selected_member_ == x.selected_member_)
if (x.selected_member_ == selected_member_)
{
switch (selected_member_)
if (0x0FFFFFFFu != selected_member_)
{
case 0x00000001:
ret_value = (m_result == x.m_result);
break;
if (x.m__d == m__d)
{
switch (selected_member_)
{
case 0x00000001:
ret_value = (x.m_result == m_result);
break;

}
}
}
else
{
ret_value = true;
}
}

Expand Down Expand Up @@ -1408,19 +1426,28 @@ class TypeLookup_Call
{
bool ret_value {false};

if (m__d == x.m__d &&
selected_member_ == x.selected_member_)
if (x.selected_member_ == selected_member_)
{
switch (selected_member_)
if (0x0FFFFFFFu != selected_member_)
{
case 0x00000001:
ret_value = (m_getTypes == x.m_getTypes);
break;
if (x.m__d == m__d)
{
switch (selected_member_)
{
case 0x00000001:
ret_value = (x.m_getTypes == m_getTypes);
break;

case 0x00000002:
ret_value = (m_getTypeDependencies == x.m_getTypeDependencies);
break;
case 0x00000002:
ret_value = (x.m_getTypeDependencies == m_getTypeDependencies);
break;

}
}
}
else
{
ret_value = true;
}
}

Expand Down Expand Up @@ -1957,19 +1984,28 @@ class TypeLookup_Return
{
bool ret_value {false};

if (m__d == x.m__d &&
selected_member_ == x.selected_member_)
if (x.selected_member_ == selected_member_)
{
switch (selected_member_)
if (0x0FFFFFFFu != selected_member_)
{
case 0x00000001:
ret_value = (m_getType == x.m_getType);
break;
if (x.m__d == m__d)
{
switch (selected_member_)
{
case 0x00000001:
ret_value = (x.m_getType == m_getType);
break;

case 0x00000002:
ret_value = (m_getTypeDependencies == x.m_getTypeDependencies);
break;
case 0x00000002:
ret_value = (x.m_getTypeDependencies == m_getTypeDependencies);
break;

}
}
}
else
{
ret_value = true;
}
}

Expand Down
69 changes: 39 additions & 30 deletions src/cpp/statistics/types/monitorservice_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,47 +1465,56 @@ class MonitorServiceData
{
bool ret_value {false};

if (m__d == x.m__d &&
selected_member_ == x.selected_member_)
if (x.selected_member_ == selected_member_)
{
switch (selected_member_)
if (0x0FFFFFFFu != selected_member_)
{
case 0x00000001:
ret_value = (m_entity_proxy == x.m_entity_proxy);
break;
if (x.m__d == m__d)
{
switch (selected_member_)
{
case 0x00000001:
ret_value = (x.m_entity_proxy == m_entity_proxy);
break;

case 0x00000002:
ret_value = (m_connection_list == x.m_connection_list);
break;
case 0x00000002:
ret_value = (x.m_connection_list == m_connection_list);
break;

case 0x00000003:
ret_value = (m_incompatible_qos_status == x.m_incompatible_qos_status);
break;
case 0x00000003:
ret_value = (x.m_incompatible_qos_status == m_incompatible_qos_status);
break;

case 0x00000004:
ret_value = (m_inconsistent_topic_status == x.m_inconsistent_topic_status);
break;
case 0x00000004:
ret_value = (x.m_inconsistent_topic_status == m_inconsistent_topic_status);
break;

case 0x00000005:
ret_value = (m_liveliness_lost_status == x.m_liveliness_lost_status);
break;
case 0x00000005:
ret_value = (x.m_liveliness_lost_status == m_liveliness_lost_status);
break;

case 0x00000006:
ret_value = (m_liveliness_changed_status == x.m_liveliness_changed_status);
break;
case 0x00000006:
ret_value = (x.m_liveliness_changed_status == m_liveliness_changed_status);
break;

case 0x00000007:
ret_value = (m_deadline_missed_status == x.m_deadline_missed_status);
break;
case 0x00000007:
ret_value = (x.m_deadline_missed_status == m_deadline_missed_status);
break;

case 0x00000008:
ret_value = (m_sample_lost_status == x.m_sample_lost_status);
break;
case 0x00000008:
ret_value = (x.m_sample_lost_status == m_sample_lost_status);
break;

case 0x00000009:
ret_value = (m_statuses_size == x.m_statuses_size);
break;
case 0x00000009:
ret_value = (x.m_statuses_size == m_statuses_size);
break;

}
}
}
else
{
ret_value = true;
}
}

Expand Down
63 changes: 36 additions & 27 deletions src/cpp/statistics/types/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3169,43 +3169,52 @@ class Data
{
bool ret_value {false};

if (m__d == x.m__d &&
selected_member_ == x.selected_member_)
if (x.selected_member_ == selected_member_)
{
switch (selected_member_)
if (0x0FFFFFFFu != selected_member_)
{
case 0x00000001:
ret_value = (m_writer_reader_data == x.m_writer_reader_data);
break;
if (x.m__d == m__d)
{
switch (selected_member_)
{
case 0x00000001:
ret_value = (x.m_writer_reader_data == m_writer_reader_data);
break;

case 0x00000002:
ret_value = (m_locator2locator_data == x.m_locator2locator_data);
break;
case 0x00000002:
ret_value = (x.m_locator2locator_data == m_locator2locator_data);
break;

case 0x00000003:
ret_value = (m_entity_data == x.m_entity_data);
break;
case 0x00000003:
ret_value = (x.m_entity_data == m_entity_data);
break;

case 0x00000004:
ret_value = (m_entity2locator_traffic == x.m_entity2locator_traffic);
break;
case 0x00000004:
ret_value = (x.m_entity2locator_traffic == m_entity2locator_traffic);
break;

case 0x00000005:
ret_value = (m_entity_count == x.m_entity_count);
break;
case 0x00000005:
ret_value = (x.m_entity_count == m_entity_count);
break;

case 0x00000006:
ret_value = (m_discovery_time == x.m_discovery_time);
break;
case 0x00000006:
ret_value = (x.m_discovery_time == m_discovery_time);
break;

case 0x00000007:
ret_value = (m_sample_identity_count == x.m_sample_identity_count);
break;
case 0x00000007:
ret_value = (x.m_sample_identity_count == m_sample_identity_count);
break;

case 0x00000008:
ret_value = (m_physical_data == x.m_physical_data);
break;
case 0x00000008:
ret_value = (x.m_physical_data == m_physical_data);
break;

}
}
}
else
{
ret_value = true;
}
}

Expand Down
45 changes: 27 additions & 18 deletions test/blackbox/types/core/core_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4268,31 +4268,40 @@ class Submessage
{
bool ret_value {false};

if (m__d == x.m__d &&
selected_member_ == x.selected_member_)
if (x.selected_member_ == selected_member_)
{
switch (selected_member_)
if (0x0FFFFFFFu != selected_member_)
{
case 0x00000001:
ret_value = (m_heartbeat_submsg == x.m_heartbeat_submsg);
break;
if (x.m__d == m__d)
{
switch (selected_member_)
{
case 0x00000001:
ret_value = (x.m_heartbeat_submsg == m_heartbeat_submsg);
break;

case 0x00000002:
ret_value = (m_info_ts_submsg == x.m_info_ts_submsg);
break;
case 0x00000002:
ret_value = (x.m_info_ts_submsg == m_info_ts_submsg);
break;

case 0x00000003:
ret_value = (m_info_src_submsg == x.m_info_src_submsg);
break;
case 0x00000003:
ret_value = (x.m_info_src_submsg == m_info_src_submsg);
break;

case 0x00000004:
ret_value = (m_info_dst_submsg == x.m_info_dst_submsg);
break;
case 0x00000004:
ret_value = (x.m_info_dst_submsg == m_info_dst_submsg);
break;

case 0x00000005:
ret_value = (m_unknown_submsg == x.m_unknown_submsg);
break;
case 0x00000005:
ret_value = (x.m_unknown_submsg == m_unknown_submsg);
break;

}
}
}
else
{
ret_value = true;
}
}

Expand Down
Loading
Loading