Skip to content

Commit ce4ce74

Browse files
JesusPoderosoJesusPoderoso
authored
Regenerate types with latest Fast DDS-Gen v4.0.2 (#5306)
Signed-off-by: eProsima <[email protected]>
1 parent c92b561 commit ce4ce74

File tree

13 files changed

+1377
-774
lines changed

13 files changed

+1377
-774
lines changed

‎include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp

+240-186
Large diffs are not rendered by default.

‎src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp

+66-30
Original file line numberDiff line numberDiff line change
@@ -492,15 +492,24 @@ class TypeLookup_getTypes_Result
492492
{
493493
bool ret_value {false};
494494

495-
if (m__d == x.m__d &&
496-
selected_member_ == x.selected_member_)
495+
if (x.selected_member_ == selected_member_)
497496
{
498-
switch (selected_member_)
497+
if (0x0FFFFFFFu != selected_member_)
499498
{
500-
case 0x00000001:
501-
ret_value = (m_result == x.m_result);
502-
break;
499+
if (x.m__d == m__d)
500+
{
501+
switch (selected_member_)
502+
{
503+
case 0x00000001:
504+
ret_value = (x.m_result == m_result);
505+
break;
503506

507+
}
508+
}
509+
}
510+
else
511+
{
512+
ret_value = true;
504513
}
505514
}
506515

@@ -1122,15 +1131,24 @@ class TypeLookup_getTypeDependencies_Result
11221131
{
11231132
bool ret_value {false};
11241133

1125-
if (m__d == x.m__d &&
1126-
selected_member_ == x.selected_member_)
1134+
if (x.selected_member_ == selected_member_)
11271135
{
1128-
switch (selected_member_)
1136+
if (0x0FFFFFFFu != selected_member_)
11291137
{
1130-
case 0x00000001:
1131-
ret_value = (m_result == x.m_result);
1132-
break;
1138+
if (x.m__d == m__d)
1139+
{
1140+
switch (selected_member_)
1141+
{
1142+
case 0x00000001:
1143+
ret_value = (x.m_result == m_result);
1144+
break;
11331145

1146+
}
1147+
}
1148+
}
1149+
else
1150+
{
1151+
ret_value = true;
11341152
}
11351153
}
11361154

@@ -1408,19 +1426,28 @@ class TypeLookup_Call
14081426
{
14091427
bool ret_value {false};
14101428

1411-
if (m__d == x.m__d &&
1412-
selected_member_ == x.selected_member_)
1429+
if (x.selected_member_ == selected_member_)
14131430
{
1414-
switch (selected_member_)
1431+
if (0x0FFFFFFFu != selected_member_)
14151432
{
1416-
case 0x00000001:
1417-
ret_value = (m_getTypes == x.m_getTypes);
1418-
break;
1433+
if (x.m__d == m__d)
1434+
{
1435+
switch (selected_member_)
1436+
{
1437+
case 0x00000001:
1438+
ret_value = (x.m_getTypes == m_getTypes);
1439+
break;
14191440

1420-
case 0x00000002:
1421-
ret_value = (m_getTypeDependencies == x.m_getTypeDependencies);
1422-
break;
1441+
case 0x00000002:
1442+
ret_value = (x.m_getTypeDependencies == m_getTypeDependencies);
1443+
break;
14231444

1445+
}
1446+
}
1447+
}
1448+
else
1449+
{
1450+
ret_value = true;
14241451
}
14251452
}
14261453

@@ -1957,19 +1984,28 @@ class TypeLookup_Return
19571984
{
19581985
bool ret_value {false};
19591986

1960-
if (m__d == x.m__d &&
1961-
selected_member_ == x.selected_member_)
1987+
if (x.selected_member_ == selected_member_)
19621988
{
1963-
switch (selected_member_)
1989+
if (0x0FFFFFFFu != selected_member_)
19641990
{
1965-
case 0x00000001:
1966-
ret_value = (m_getType == x.m_getType);
1967-
break;
1991+
if (x.m__d == m__d)
1992+
{
1993+
switch (selected_member_)
1994+
{
1995+
case 0x00000001:
1996+
ret_value = (x.m_getType == m_getType);
1997+
break;
19681998

1969-
case 0x00000002:
1970-
ret_value = (m_getTypeDependencies == x.m_getTypeDependencies);
1971-
break;
1999+
case 0x00000002:
2000+
ret_value = (x.m_getTypeDependencies == m_getTypeDependencies);
2001+
break;
19722002

2003+
}
2004+
}
2005+
}
2006+
else
2007+
{
2008+
ret_value = true;
19732009
}
19742010
}
19752011

‎src/cpp/statistics/types/monitorservice_types.hpp

+39-30
Original file line numberDiff line numberDiff line change
@@ -1465,47 +1465,56 @@ class MonitorServiceData
14651465
{
14661466
bool ret_value {false};
14671467

1468-
if (m__d == x.m__d &&
1469-
selected_member_ == x.selected_member_)
1468+
if (x.selected_member_ == selected_member_)
14701469
{
1471-
switch (selected_member_)
1470+
if (0x0FFFFFFFu != selected_member_)
14721471
{
1473-
case 0x00000001:
1474-
ret_value = (m_entity_proxy == x.m_entity_proxy);
1475-
break;
1472+
if (x.m__d == m__d)
1473+
{
1474+
switch (selected_member_)
1475+
{
1476+
case 0x00000001:
1477+
ret_value = (x.m_entity_proxy == m_entity_proxy);
1478+
break;
14761479

1477-
case 0x00000002:
1478-
ret_value = (m_connection_list == x.m_connection_list);
1479-
break;
1480+
case 0x00000002:
1481+
ret_value = (x.m_connection_list == m_connection_list);
1482+
break;
14801483

1481-
case 0x00000003:
1482-
ret_value = (m_incompatible_qos_status == x.m_incompatible_qos_status);
1483-
break;
1484+
case 0x00000003:
1485+
ret_value = (x.m_incompatible_qos_status == m_incompatible_qos_status);
1486+
break;
14841487

1485-
case 0x00000004:
1486-
ret_value = (m_inconsistent_topic_status == x.m_inconsistent_topic_status);
1487-
break;
1488+
case 0x00000004:
1489+
ret_value = (x.m_inconsistent_topic_status == m_inconsistent_topic_status);
1490+
break;
14881491

1489-
case 0x00000005:
1490-
ret_value = (m_liveliness_lost_status == x.m_liveliness_lost_status);
1491-
break;
1492+
case 0x00000005:
1493+
ret_value = (x.m_liveliness_lost_status == m_liveliness_lost_status);
1494+
break;
14921495

1493-
case 0x00000006:
1494-
ret_value = (m_liveliness_changed_status == x.m_liveliness_changed_status);
1495-
break;
1496+
case 0x00000006:
1497+
ret_value = (x.m_liveliness_changed_status == m_liveliness_changed_status);
1498+
break;
14961499

1497-
case 0x00000007:
1498-
ret_value = (m_deadline_missed_status == x.m_deadline_missed_status);
1499-
break;
1500+
case 0x00000007:
1501+
ret_value = (x.m_deadline_missed_status == m_deadline_missed_status);
1502+
break;
15001503

1501-
case 0x00000008:
1502-
ret_value = (m_sample_lost_status == x.m_sample_lost_status);
1503-
break;
1504+
case 0x00000008:
1505+
ret_value = (x.m_sample_lost_status == m_sample_lost_status);
1506+
break;
15041507

1505-
case 0x00000009:
1506-
ret_value = (m_statuses_size == x.m_statuses_size);
1507-
break;
1508+
case 0x00000009:
1509+
ret_value = (x.m_statuses_size == m_statuses_size);
1510+
break;
15081511

1512+
}
1513+
}
1514+
}
1515+
else
1516+
{
1517+
ret_value = true;
15091518
}
15101519
}
15111520

‎src/cpp/statistics/types/types.hpp

+36-27
Original file line numberDiff line numberDiff line change
@@ -3169,43 +3169,52 @@ class Data
31693169
{
31703170
bool ret_value {false};
31713171

3172-
if (m__d == x.m__d &&
3173-
selected_member_ == x.selected_member_)
3172+
if (x.selected_member_ == selected_member_)
31743173
{
3175-
switch (selected_member_)
3174+
if (0x0FFFFFFFu != selected_member_)
31763175
{
3177-
case 0x00000001:
3178-
ret_value = (m_writer_reader_data == x.m_writer_reader_data);
3179-
break;
3176+
if (x.m__d == m__d)
3177+
{
3178+
switch (selected_member_)
3179+
{
3180+
case 0x00000001:
3181+
ret_value = (x.m_writer_reader_data == m_writer_reader_data);
3182+
break;
31803183

3181-
case 0x00000002:
3182-
ret_value = (m_locator2locator_data == x.m_locator2locator_data);
3183-
break;
3184+
case 0x00000002:
3185+
ret_value = (x.m_locator2locator_data == m_locator2locator_data);
3186+
break;
31843187

3185-
case 0x00000003:
3186-
ret_value = (m_entity_data == x.m_entity_data);
3187-
break;
3188+
case 0x00000003:
3189+
ret_value = (x.m_entity_data == m_entity_data);
3190+
break;
31883191

3189-
case 0x00000004:
3190-
ret_value = (m_entity2locator_traffic == x.m_entity2locator_traffic);
3191-
break;
3192+
case 0x00000004:
3193+
ret_value = (x.m_entity2locator_traffic == m_entity2locator_traffic);
3194+
break;
31923195

3193-
case 0x00000005:
3194-
ret_value = (m_entity_count == x.m_entity_count);
3195-
break;
3196+
case 0x00000005:
3197+
ret_value = (x.m_entity_count == m_entity_count);
3198+
break;
31963199

3197-
case 0x00000006:
3198-
ret_value = (m_discovery_time == x.m_discovery_time);
3199-
break;
3200+
case 0x00000006:
3201+
ret_value = (x.m_discovery_time == m_discovery_time);
3202+
break;
32003203

3201-
case 0x00000007:
3202-
ret_value = (m_sample_identity_count == x.m_sample_identity_count);
3203-
break;
3204+
case 0x00000007:
3205+
ret_value = (x.m_sample_identity_count == m_sample_identity_count);
3206+
break;
32043207

3205-
case 0x00000008:
3206-
ret_value = (m_physical_data == x.m_physical_data);
3207-
break;
3208+
case 0x00000008:
3209+
ret_value = (x.m_physical_data == m_physical_data);
3210+
break;
32083211

3212+
}
3213+
}
3214+
}
3215+
else
3216+
{
3217+
ret_value = true;
32093218
}
32103219
}
32113220

‎test/blackbox/types/core/core_types.hpp

+27-18
Original file line numberDiff line numberDiff line change
@@ -4268,31 +4268,40 @@ class Submessage
42684268
{
42694269
bool ret_value {false};
42704270

4271-
if (m__d == x.m__d &&
4272-
selected_member_ == x.selected_member_)
4271+
if (x.selected_member_ == selected_member_)
42734272
{
4274-
switch (selected_member_)
4273+
if (0x0FFFFFFFu != selected_member_)
42754274
{
4276-
case 0x00000001:
4277-
ret_value = (m_heartbeat_submsg == x.m_heartbeat_submsg);
4278-
break;
4275+
if (x.m__d == m__d)
4276+
{
4277+
switch (selected_member_)
4278+
{
4279+
case 0x00000001:
4280+
ret_value = (x.m_heartbeat_submsg == m_heartbeat_submsg);
4281+
break;
42794282

4280-
case 0x00000002:
4281-
ret_value = (m_info_ts_submsg == x.m_info_ts_submsg);
4282-
break;
4283+
case 0x00000002:
4284+
ret_value = (x.m_info_ts_submsg == m_info_ts_submsg);
4285+
break;
42834286

4284-
case 0x00000003:
4285-
ret_value = (m_info_src_submsg == x.m_info_src_submsg);
4286-
break;
4287+
case 0x00000003:
4288+
ret_value = (x.m_info_src_submsg == m_info_src_submsg);
4289+
break;
42874290

4288-
case 0x00000004:
4289-
ret_value = (m_info_dst_submsg == x.m_info_dst_submsg);
4290-
break;
4291+
case 0x00000004:
4292+
ret_value = (x.m_info_dst_submsg == m_info_dst_submsg);
4293+
break;
42914294

4292-
case 0x00000005:
4293-
ret_value = (m_unknown_submsg == x.m_unknown_submsg);
4294-
break;
4295+
case 0x00000005:
4296+
ret_value = (x.m_unknown_submsg == m_unknown_submsg);
4297+
break;
42954298

4299+
}
4300+
}
4301+
}
4302+
else
4303+
{
4304+
ret_value = true;
42964305
}
42974306
}
42984307

0 commit comments

Comments
 (0)