Skip to content
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

Jump to bottom

Add test for a union using an alias with scope #5330

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add test for a union using an alias with scope #5330

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abf0e6c
Refs #21823. Update submodule and regenerate code
richiware Oct 16, 2024
d318a39
Refs #21823. Add dynamic types test.
richiware Oct 16, 2024
a921c44
Refs #21823. Regenerate TypeLookupService tests
richiware Oct 16, 2024
50124f8
Refs #21823. Apply suggestions
richiware Oct 18, 2024
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
222 changes: 178 additions & 44 deletions include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 24 additions & 6 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 @@ -640,7 +640,10 @@ class TypeLookup_getTypes_Result
}

selected_member_ = 0x00000001;
member_destructor_ = [&]() {m_result.~TypeLookup_getTypes_Out();};
member_destructor_ = [&]()
{
m_result.~TypeLookup_getTypes_Out();\
};
new(&m_result) TypeLookup_getTypes_Out();

}
Expand Down Expand Up @@ -1279,7 +1282,10 @@ class TypeLookup_getTypeDependencies_Result
}

selected_member_ = 0x00000001;
member_destructor_ = [&]() {m_result.~TypeLookup_getTypeDependencies_Out();};
member_destructor_ = [&]()
{
m_result.~TypeLookup_getTypeDependencies_Out();\
};
new(&m_result) TypeLookup_getTypeDependencies_Out();

}
Expand Down Expand Up @@ -1638,7 +1644,10 @@ class TypeLookup_Call
}

selected_member_ = 0x00000001;
member_destructor_ = [&]() {m_getTypes.~TypeLookup_getTypes_In();};
member_destructor_ = [&]()
{
m_getTypes.~TypeLookup_getTypes_In();\
};
new(&m_getTypes) TypeLookup_getTypes_In();

}
Expand All @@ -1656,7 +1665,10 @@ class TypeLookup_Call
}

selected_member_ = 0x00000002;
member_destructor_ = [&]() {m_getTypeDependencies.~TypeLookup_getTypeDependencies_In();};
member_destructor_ = [&]()
{
m_getTypeDependencies.~TypeLookup_getTypeDependencies_In();\
};
new(&m_getTypeDependencies) TypeLookup_getTypeDependencies_In();

}
Expand Down Expand Up @@ -2196,7 +2208,10 @@ class TypeLookup_Return
}

selected_member_ = 0x00000001;
member_destructor_ = [&]() {m_getType.~TypeLookup_getTypes_Result();};
member_destructor_ = [&]()
{
m_getType.~TypeLookup_getTypes_Result();\
};
new(&m_getType) TypeLookup_getTypes_Result();

}
Expand All @@ -2214,7 +2229,10 @@ class TypeLookup_Return
}

selected_member_ = 0x00000002;
member_destructor_ = [&]() {m_getTypeDependencies.~TypeLookup_getTypeDependencies_Result();};
member_destructor_ = [&]()
{
m_getTypeDependencies.~TypeLookup_getTypeDependencies_Result();\
};
new(&m_getTypeDependencies) TypeLookup_getTypeDependencies_Result();

}
Expand Down
43 changes: 35 additions & 8 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 @@ -2114,7 +2114,10 @@ class MonitorServiceData
}

selected_member_ = 0x00000001;
member_destructor_ = [&]() {m_entity_proxy.~vector();};
member_destructor_ = [&]()
{
m_entity_proxy.~vector();\
};
new(&m_entity_proxy) std::vector<uint8_t>();

}
Expand All @@ -2132,7 +2135,10 @@ class MonitorServiceData
}

selected_member_ = 0x00000002;
member_destructor_ = [&]() {m_connection_list.~vector();};
member_destructor_ = [&]()
{
m_connection_list.~vector();\
};
new(&m_connection_list) std::vector<Connection>();

}
Expand All @@ -2150,7 +2156,10 @@ class MonitorServiceData
}

selected_member_ = 0x00000003;
member_destructor_ = [&]() {m_incompatible_qos_status.~IncompatibleQoSStatus_s();};
member_destructor_ = [&]()
{
m_incompatible_qos_status.~IncompatibleQoSStatus_s();\
};
new(&m_incompatible_qos_status) IncompatibleQoSStatus_s();

}
Expand All @@ -2168,7 +2177,11 @@ class MonitorServiceData
}

selected_member_ = 0x00000004;
member_destructor_ = [&]() {m_inconsistent_topic_status.~InconsistentTopicStatus_s();};
member_destructor_ = [&]()
{
using namespace eprosima::fastdds::statistics;
m_inconsistent_topic_status.~InconsistentTopicStatus_s();\
};
new(&m_inconsistent_topic_status) InconsistentTopicStatus_s();

}
Expand All @@ -2186,7 +2199,11 @@ class MonitorServiceData
}

selected_member_ = 0x00000005;
member_destructor_ = [&]() {m_liveliness_lost_status.~LivelinessLostStatus_s();};
member_destructor_ = [&]()
{
using namespace eprosima::fastdds::statistics;
m_liveliness_lost_status.~LivelinessLostStatus_s();\
};
new(&m_liveliness_lost_status) LivelinessLostStatus_s();

}
Expand All @@ -2204,7 +2221,10 @@ class MonitorServiceData
}

selected_member_ = 0x00000006;
member_destructor_ = [&]() {m_liveliness_changed_status.~LivelinessChangedStatus_s();};
member_destructor_ = [&]()
{
m_liveliness_changed_status.~LivelinessChangedStatus_s();\
};
new(&m_liveliness_changed_status) LivelinessChangedStatus_s();

}
Expand All @@ -2222,7 +2242,10 @@ class MonitorServiceData
}

selected_member_ = 0x00000007;
member_destructor_ = [&]() {m_deadline_missed_status.~DeadlineMissedStatus_s();};
member_destructor_ = [&]()
{
m_deadline_missed_status.~DeadlineMissedStatus_s();\
};
new(&m_deadline_missed_status) DeadlineMissedStatus_s();

}
Expand All @@ -2240,7 +2263,11 @@ class MonitorServiceData
}

selected_member_ = 0x00000008;
member_destructor_ = [&]() {m_sample_lost_status.~SampleLostStatus_s();};
member_destructor_ = [&]()
{
using namespace eprosima::fastdds::statistics;
m_sample_lost_status.~SampleLostStatus_s();\
};
new(&m_sample_lost_status) SampleLostStatus_s();

}
Expand Down
40 changes: 32 additions & 8 deletions src/cpp/statistics/types/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3774,7 +3774,10 @@ class Data
}

selected_member_ = 0x00000001;
member_destructor_ = [&]() {m_writer_reader_data.~WriterReaderData();};
member_destructor_ = [&]()
{
m_writer_reader_data.~WriterReaderData();\
};
new(&m_writer_reader_data) WriterReaderData();

}
Expand All @@ -3792,7 +3795,10 @@ class Data
}

selected_member_ = 0x00000002;
member_destructor_ = [&]() {m_locator2locator_data.~Locator2LocatorData();};
member_destructor_ = [&]()
{
m_locator2locator_data.~Locator2LocatorData();\
};
new(&m_locator2locator_data) Locator2LocatorData();

}
Expand All @@ -3810,7 +3816,10 @@ class Data
}

selected_member_ = 0x00000003;
member_destructor_ = [&]() {m_entity_data.~EntityData();};
member_destructor_ = [&]()
{
m_entity_data.~EntityData();\
};
new(&m_entity_data) EntityData();

}
Expand All @@ -3828,7 +3837,10 @@ class Data
}

selected_member_ = 0x00000004;
member_destructor_ = [&]() {m_entity2locator_traffic.~Entity2LocatorTraffic();};
member_destructor_ = [&]()
{
m_entity2locator_traffic.~Entity2LocatorTraffic();\
};
new(&m_entity2locator_traffic) Entity2LocatorTraffic();

}
Expand All @@ -3846,7 +3858,10 @@ class Data
}

selected_member_ = 0x00000005;
member_destructor_ = [&]() {m_entity_count.~EntityCount();};
member_destructor_ = [&]()
{
m_entity_count.~EntityCount();\
};
new(&m_entity_count) EntityCount();

}
Expand All @@ -3864,7 +3879,10 @@ class Data
}

selected_member_ = 0x00000006;
member_destructor_ = [&]() {m_discovery_time.~DiscoveryTime();};
member_destructor_ = [&]()
{
m_discovery_time.~DiscoveryTime();\
};
new(&m_discovery_time) DiscoveryTime();

}
Expand All @@ -3882,7 +3900,10 @@ class Data
}

selected_member_ = 0x00000007;
member_destructor_ = [&]() {m_sample_identity_count.~SampleIdentityCount();};
member_destructor_ = [&]()
{
m_sample_identity_count.~SampleIdentityCount();\
};
new(&m_sample_identity_count) SampleIdentityCount();

}
Expand All @@ -3900,7 +3921,10 @@ class Data
}

selected_member_ = 0x00000008;
member_destructor_ = [&]() {m_physical_data.~PhysicalData();};
member_destructor_ = [&]()
{
m_physical_data.~PhysicalData();\
};
new(&m_physical_data) PhysicalData();

}
Expand Down
30 changes: 24 additions & 6 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 @@ -4103,7 +4103,10 @@ class Submessage
eProsima_user_DllExport Submessage()
{
selected_member_ = 0x00000005;
member_destructor_ = [&]() {m_unknown_submsg.~SubmessageHeader();};
member_destructor_ = [&]()
{
m_unknown_submsg.~SubmessageHeader();\
};
new(&m_unknown_submsg) SubmessageHeader();

}
Expand Down Expand Up @@ -4662,7 +4665,10 @@ class Submessage
}

selected_member_ = 0x00000001;
member_destructor_ = [&]() {m_heartbeat_submsg.~HeartBeatSubmessage();};
member_destructor_ = [&]()
{
m_heartbeat_submsg.~HeartBeatSubmessage();\
};
new(&m_heartbeat_submsg) HeartBeatSubmessage();

}
Expand All @@ -4680,7 +4686,10 @@ class Submessage
}

selected_member_ = 0x00000002;
member_destructor_ = [&]() {m_info_ts_submsg.~InfoTimestampSubmessage();};
member_destructor_ = [&]()
{
m_info_ts_submsg.~InfoTimestampSubmessage();\
};
new(&m_info_ts_submsg) InfoTimestampSubmessage();

}
Expand All @@ -4698,7 +4707,10 @@ class Submessage
}

selected_member_ = 0x00000003;
member_destructor_ = [&]() {m_info_src_submsg.~InfoSourceSubmessage();};
member_destructor_ = [&]()
{
m_info_src_submsg.~InfoSourceSubmessage();\
};
new(&m_info_src_submsg) InfoSourceSubmessage();

}
Expand All @@ -4716,7 +4728,10 @@ class Submessage
}

selected_member_ = 0x00000004;
member_destructor_ = [&]() {m_info_dst_submsg.~InfoDestinationSubmessage();};
member_destructor_ = [&]()
{
m_info_dst_submsg.~InfoDestinationSubmessage();\
};
new(&m_info_dst_submsg) InfoDestinationSubmessage();

}
Expand All @@ -4734,7 +4749,10 @@ class Submessage
}

selected_member_ = 0x00000005;
member_destructor_ = [&]() {m_unknown_submsg.~SubmessageHeader();};
member_destructor_ = [&]()
{
m_unknown_submsg.~SubmessageHeader();\
};
new(&m_unknown_submsg) SubmessageHeader();

}
Expand Down
Loading