From d6be936f9e407f0fb723f7dcce5b3986687d920a Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Wed, 11 Sep 2024 14:11:06 +0200 Subject: [PATCH] Refs #21636: Regenerate types with Gen v4.0.1 Signed-off-by: JesusPoderoso --- .../detail/dds_xtypes_typeobject.hpp | 132 ++++++++------- .../detail/TypeLookupTypes.hpp | 12 +- .../statistics/types/monitorservice_types.hpp | 18 +- src/cpp/statistics/types/types.hpp | 16 +- test/blackbox/types/core/core_types.hpp | 15 +- .../types/statistics/monitorservice_types.hpp | 18 +- test/blackbox/types/statistics/types.hpp | 16 +- test/dds-types-test/constants.hpp | 2 +- test/dds-types-test/declarations.hpp | 8 +- test/dds-types-test/external.hpp | 12 +- .../helpers/basic_inner_types.hpp | 11 +- test/dds-types-test/unions.hpp | 157 ++++++++++-------- .../types/union_struct/gen/union_struct.hpp | 18 +- .../gen/ComprehensiveType.hpp | 18 +- 14 files changed, 250 insertions(+), 203 deletions(-) diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp index 4e804c0dd8f..7daa78fa650 100644 --- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp +++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp @@ -392,7 +392,7 @@ class TypeObjectHashId selected_member_ = 0x00000001; member_destructor_ = [&]() {m_hash.~EquivalenceHash();}; new(&m_hash) EquivalenceHash(); - ; + } return m_hash; @@ -2812,7 +2812,10 @@ class TypeIdentifier */ eProsima_user_DllExport TypeIdentifier() { - no_value_(); + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_no_value.~Dummy();}; + new(&m_no_value) Dummy(); + } /*! @@ -3940,7 +3943,7 @@ class TypeIdentifier selected_member_ = 0x00000001; member_destructor_ = [&]() {m_no_value.~Dummy();}; new(&m_no_value) Dummy(); - ; + } return m_no_value; @@ -3958,7 +3961,7 @@ class TypeIdentifier selected_member_ = 0x00000002; member_destructor_ = [&]() {m_string_sdefn.~StringSTypeDefn();}; new(&m_string_sdefn) StringSTypeDefn(); - ; + } return m_string_sdefn; @@ -3976,7 +3979,7 @@ class TypeIdentifier selected_member_ = 0x00000003; member_destructor_ = [&]() {m_string_ldefn.~StringLTypeDefn();}; new(&m_string_ldefn) StringLTypeDefn(); - ; + } return m_string_ldefn; @@ -3994,7 +3997,7 @@ class TypeIdentifier selected_member_ = 0x00000004; member_destructor_ = [&]() {m_seq_sdefn.~PlainSequenceSElemDefn();}; new(&m_seq_sdefn) PlainSequenceSElemDefn(); - ; + } return m_seq_sdefn; @@ -4012,7 +4015,7 @@ class TypeIdentifier selected_member_ = 0x00000005; member_destructor_ = [&]() {m_seq_ldefn.~PlainSequenceLElemDefn();}; new(&m_seq_ldefn) PlainSequenceLElemDefn(); - ; + } return m_seq_ldefn; @@ -4030,7 +4033,7 @@ class TypeIdentifier selected_member_ = 0x00000006; member_destructor_ = [&]() {m_array_sdefn.~PlainArraySElemDefn();}; new(&m_array_sdefn) PlainArraySElemDefn(); - ; + } return m_array_sdefn; @@ -4048,7 +4051,7 @@ class TypeIdentifier selected_member_ = 0x00000007; member_destructor_ = [&]() {m_array_ldefn.~PlainArrayLElemDefn();}; new(&m_array_ldefn) PlainArrayLElemDefn(); - ; + } return m_array_ldefn; @@ -4066,7 +4069,7 @@ class TypeIdentifier selected_member_ = 0x00000008; member_destructor_ = [&]() {m_map_sdefn.~PlainMapSTypeDefn();}; new(&m_map_sdefn) PlainMapSTypeDefn(); - ; + } return m_map_sdefn; @@ -4084,7 +4087,7 @@ class TypeIdentifier selected_member_ = 0x00000009; member_destructor_ = [&]() {m_map_ldefn.~PlainMapLTypeDefn();}; new(&m_map_ldefn) PlainMapLTypeDefn(); - ; + } return m_map_ldefn; @@ -4102,7 +4105,7 @@ class TypeIdentifier selected_member_ = 0x0000000a; member_destructor_ = [&]() {m_sc_component_id.~StronglyConnectedComponentId();}; new(&m_sc_component_id) StronglyConnectedComponentId(); - ; + } return m_sc_component_id; @@ -4120,7 +4123,7 @@ class TypeIdentifier selected_member_ = 0x0000000b; member_destructor_ = [&]() {m_equivalence_hash.~EquivalenceHash();}; new(&m_equivalence_hash) EquivalenceHash(); - ; + } return m_equivalence_hash; @@ -4138,7 +4141,7 @@ class TypeIdentifier selected_member_ = 0x0000000c; member_destructor_ = [&]() {m_extended_defn.~ExtendedTypeDefn();}; new(&m_extended_defn) ExtendedTypeDefn(); - ; + } return m_extended_defn; @@ -4281,7 +4284,10 @@ class AnnotationParameterValue */ eProsima_user_DllExport AnnotationParameterValue() { - extended_value_(); + selected_member_ = 0x00000013; + member_destructor_ = [&]() {m_extended_value.~ExtendedAnnotationParameterValue();}; + new(&m_extended_value) ExtendedAnnotationParameterValue(); + } /*! @@ -5775,7 +5781,7 @@ class AnnotationParameterValue selected_member_ = 0x00000001; member_destructor_ = nullptr; m_boolean_value = {false}; - ; + } return m_boolean_value; @@ -5793,7 +5799,7 @@ class AnnotationParameterValue selected_member_ = 0x00000002; member_destructor_ = nullptr; m_byte_value = {0}; - ; + } return m_byte_value; @@ -5811,7 +5817,7 @@ class AnnotationParameterValue selected_member_ = 0x00000003; member_destructor_ = nullptr; m_int8_value = {0}; - ; + } return m_int8_value; @@ -5829,7 +5835,7 @@ class AnnotationParameterValue selected_member_ = 0x00000004; member_destructor_ = nullptr; m_uint8_value = {0}; - ; + } return m_uint8_value; @@ -5847,7 +5853,7 @@ class AnnotationParameterValue selected_member_ = 0x00000005; member_destructor_ = nullptr; m_int16_value = {0}; - ; + } return m_int16_value; @@ -5865,7 +5871,7 @@ class AnnotationParameterValue selected_member_ = 0x00000006; member_destructor_ = nullptr; m_uint_16_value = {0}; - ; + } return m_uint_16_value; @@ -5883,7 +5889,7 @@ class AnnotationParameterValue selected_member_ = 0x00000007; member_destructor_ = nullptr; m_int32_value = {0}; - ; + } return m_int32_value; @@ -5901,7 +5907,7 @@ class AnnotationParameterValue selected_member_ = 0x00000008; member_destructor_ = nullptr; m_uint32_value = {0}; - ; + } return m_uint32_value; @@ -5919,7 +5925,7 @@ class AnnotationParameterValue selected_member_ = 0x00000009; member_destructor_ = nullptr; m_int64_value = {0}; - ; + } return m_int64_value; @@ -5937,7 +5943,7 @@ class AnnotationParameterValue selected_member_ = 0x0000000a; member_destructor_ = nullptr; m_uint64_value = {0}; - ; + } return m_uint64_value; @@ -5955,7 +5961,7 @@ class AnnotationParameterValue selected_member_ = 0x0000000b; member_destructor_ = nullptr; m_float32_value = {0.0}; - ; + } return m_float32_value; @@ -5973,7 +5979,7 @@ class AnnotationParameterValue selected_member_ = 0x0000000c; member_destructor_ = nullptr; m_float64_value = {0.0}; - ; + } return m_float64_value; @@ -5991,7 +5997,7 @@ class AnnotationParameterValue selected_member_ = 0x0000000d; member_destructor_ = nullptr; m_float128_value = {0.0}; - ; + } return m_float128_value; @@ -6009,7 +6015,7 @@ class AnnotationParameterValue selected_member_ = 0x0000000e; member_destructor_ = nullptr; m_char_value = {0}; - ; + } return m_char_value; @@ -6027,7 +6033,7 @@ class AnnotationParameterValue selected_member_ = 0x0000000f; member_destructor_ = nullptr; m_wchar_value = {0}; - ; + } return m_wchar_value; @@ -6045,7 +6051,7 @@ class AnnotationParameterValue selected_member_ = 0x00000010; member_destructor_ = nullptr; m_enumerated_value = {0}; - ; + } return m_enumerated_value; @@ -6063,7 +6069,7 @@ class AnnotationParameterValue selected_member_ = 0x00000011; member_destructor_ = [&]() {m_string8_value.~fixed_string();}; new(&m_string8_value) eprosima::fastcdr::fixed_string(); - ; + } return m_string8_value; @@ -6081,7 +6087,7 @@ class AnnotationParameterValue selected_member_ = 0x00000012; member_destructor_ = [&]() {m_string16_value.~basic_string();}; new(&m_string16_value) std::wstring(); - ; + } return m_string16_value; @@ -6099,7 +6105,7 @@ class AnnotationParameterValue selected_member_ = 0x00000013; member_destructor_ = [&]() {m_extended_value.~ExtendedAnnotationParameterValue();}; new(&m_extended_value) ExtendedAnnotationParameterValue(); - ; + } return m_extended_value; @@ -20686,7 +20692,10 @@ class CompleteTypeObject */ eProsima_user_DllExport CompleteTypeObject() { - extended_type_(); + selected_member_ = 0x0000000b; + member_destructor_ = [&]() {m_extended_type.~CompleteExtendedType();}; + new(&m_extended_type) CompleteExtendedType(); + } /*! @@ -21716,7 +21725,7 @@ class CompleteTypeObject selected_member_ = 0x00000001; member_destructor_ = [&]() {m_alias_type.~CompleteAliasType();}; new(&m_alias_type) CompleteAliasType(); - ; + } return m_alias_type; @@ -21734,7 +21743,7 @@ class CompleteTypeObject selected_member_ = 0x00000002; member_destructor_ = [&]() {m_annotation_type.~CompleteAnnotationType();}; new(&m_annotation_type) CompleteAnnotationType(); - ; + } return m_annotation_type; @@ -21752,7 +21761,7 @@ class CompleteTypeObject selected_member_ = 0x00000003; member_destructor_ = [&]() {m_struct_type.~CompleteStructType();}; new(&m_struct_type) CompleteStructType(); - ; + } return m_struct_type; @@ -21770,7 +21779,7 @@ class CompleteTypeObject selected_member_ = 0x00000004; member_destructor_ = [&]() {m_union_type.~CompleteUnionType();}; new(&m_union_type) CompleteUnionType(); - ; + } return m_union_type; @@ -21788,7 +21797,7 @@ class CompleteTypeObject selected_member_ = 0x00000005; member_destructor_ = [&]() {m_bitset_type.~CompleteBitsetType();}; new(&m_bitset_type) CompleteBitsetType(); - ; + } return m_bitset_type; @@ -21806,7 +21815,7 @@ class CompleteTypeObject selected_member_ = 0x00000006; member_destructor_ = [&]() {m_sequence_type.~CompleteSequenceType();}; new(&m_sequence_type) CompleteSequenceType(); - ; + } return m_sequence_type; @@ -21824,7 +21833,7 @@ class CompleteTypeObject selected_member_ = 0x00000007; member_destructor_ = [&]() {m_array_type.~CompleteArrayType();}; new(&m_array_type) CompleteArrayType(); - ; + } return m_array_type; @@ -21842,7 +21851,7 @@ class CompleteTypeObject selected_member_ = 0x00000008; member_destructor_ = [&]() {m_map_type.~CompleteMapType();}; new(&m_map_type) CompleteMapType(); - ; + } return m_map_type; @@ -21860,7 +21869,7 @@ class CompleteTypeObject selected_member_ = 0x00000009; member_destructor_ = [&]() {m_enumerated_type.~CompleteEnumeratedType();}; new(&m_enumerated_type) CompleteEnumeratedType(); - ; + } return m_enumerated_type; @@ -21878,7 +21887,7 @@ class CompleteTypeObject selected_member_ = 0x0000000a; member_destructor_ = [&]() {m_bitmask_type.~CompleteBitmaskType();}; new(&m_bitmask_type) CompleteBitmaskType(); - ; + } return m_bitmask_type; @@ -21896,7 +21905,7 @@ class CompleteTypeObject selected_member_ = 0x0000000b; member_destructor_ = [&]() {m_extended_type.~CompleteExtendedType();}; new(&m_extended_type) CompleteExtendedType(); - ; + } return m_extended_type; @@ -22032,7 +22041,10 @@ class MinimalTypeObject */ eProsima_user_DllExport MinimalTypeObject() { - extended_type_(); + selected_member_ = 0x0000000b; + member_destructor_ = [&]() {m_extended_type.~MinimalExtendedType();}; + new(&m_extended_type) MinimalExtendedType(); + } /*! @@ -23062,7 +23074,7 @@ class MinimalTypeObject selected_member_ = 0x00000001; member_destructor_ = [&]() {m_alias_type.~MinimalAliasType();}; new(&m_alias_type) MinimalAliasType(); - ; + } return m_alias_type; @@ -23080,7 +23092,7 @@ class MinimalTypeObject selected_member_ = 0x00000002; member_destructor_ = [&]() {m_annotation_type.~MinimalAnnotationType();}; new(&m_annotation_type) MinimalAnnotationType(); - ; + } return m_annotation_type; @@ -23098,7 +23110,7 @@ class MinimalTypeObject selected_member_ = 0x00000003; member_destructor_ = [&]() {m_struct_type.~MinimalStructType();}; new(&m_struct_type) MinimalStructType(); - ; + } return m_struct_type; @@ -23116,7 +23128,7 @@ class MinimalTypeObject selected_member_ = 0x00000004; member_destructor_ = [&]() {m_union_type.~MinimalUnionType();}; new(&m_union_type) MinimalUnionType(); - ; + } return m_union_type; @@ -23134,7 +23146,7 @@ class MinimalTypeObject selected_member_ = 0x00000005; member_destructor_ = [&]() {m_bitset_type.~MinimalBitsetType();}; new(&m_bitset_type) MinimalBitsetType(); - ; + } return m_bitset_type; @@ -23152,7 +23164,7 @@ class MinimalTypeObject selected_member_ = 0x00000006; member_destructor_ = [&]() {m_sequence_type.~MinimalSequenceType();}; new(&m_sequence_type) MinimalSequenceType(); - ; + } return m_sequence_type; @@ -23170,7 +23182,7 @@ class MinimalTypeObject selected_member_ = 0x00000007; member_destructor_ = [&]() {m_array_type.~MinimalArrayType();}; new(&m_array_type) MinimalArrayType(); - ; + } return m_array_type; @@ -23188,7 +23200,7 @@ class MinimalTypeObject selected_member_ = 0x00000008; member_destructor_ = [&]() {m_map_type.~MinimalMapType();}; new(&m_map_type) MinimalMapType(); - ; + } return m_map_type; @@ -23206,7 +23218,7 @@ class MinimalTypeObject selected_member_ = 0x00000009; member_destructor_ = [&]() {m_enumerated_type.~MinimalEnumeratedType();}; new(&m_enumerated_type) MinimalEnumeratedType(); - ; + } return m_enumerated_type; @@ -23224,7 +23236,7 @@ class MinimalTypeObject selected_member_ = 0x0000000a; member_destructor_ = [&]() {m_bitmask_type.~MinimalBitmaskType();}; new(&m_bitmask_type) MinimalBitmaskType(); - ; + } return m_bitmask_type; @@ -23242,7 +23254,7 @@ class MinimalTypeObject selected_member_ = 0x0000000b; member_destructor_ = [&]() {m_extended_type.~MinimalExtendedType();}; new(&m_extended_type) MinimalExtendedType(); - ; + } return m_extended_type; @@ -23602,7 +23614,7 @@ class TypeObject selected_member_ = 0x00000001; member_destructor_ = [&]() {m_complete.~CompleteTypeObject();}; new(&m_complete) CompleteTypeObject(); - ; + } return m_complete; @@ -23620,7 +23632,7 @@ class TypeObject selected_member_ = 0x00000002; member_destructor_ = [&]() {m_minimal.~MinimalTypeObject();}; new(&m_minimal) MinimalTypeObject(); - ; + } return m_minimal; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp index 40f26a5b09d..8c659d261e7 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp @@ -633,7 +633,7 @@ class TypeLookup_getTypes_Result selected_member_ = 0x00000001; member_destructor_ = [&]() {m_result.~TypeLookup_getTypes_Out();}; new(&m_result) TypeLookup_getTypes_Out(); - ; + } return m_result; @@ -1263,7 +1263,7 @@ class TypeLookup_getTypeDependencies_Result selected_member_ = 0x00000001; member_destructor_ = [&]() {m_result.~TypeLookup_getTypeDependencies_Out();}; new(&m_result) TypeLookup_getTypeDependencies_Out(); - ; + } return m_result; @@ -1613,7 +1613,7 @@ class TypeLookup_Call selected_member_ = 0x00000001; member_destructor_ = [&]() {m_getTypes.~TypeLookup_getTypes_In();}; new(&m_getTypes) TypeLookup_getTypes_In(); - ; + } return m_getTypes; @@ -1631,7 +1631,7 @@ class TypeLookup_Call selected_member_ = 0x00000002; member_destructor_ = [&]() {m_getTypeDependencies.~TypeLookup_getTypeDependencies_In();}; new(&m_getTypeDependencies) TypeLookup_getTypeDependencies_In(); - ; + } return m_getTypeDependencies; @@ -2162,7 +2162,7 @@ class TypeLookup_Return selected_member_ = 0x00000001; member_destructor_ = [&]() {m_getType.~TypeLookup_getTypes_Result();}; new(&m_getType) TypeLookup_getTypes_Result(); - ; + } return m_getType; @@ -2180,7 +2180,7 @@ class TypeLookup_Return selected_member_ = 0x00000002; member_destructor_ = [&]() {m_getTypeDependencies.~TypeLookup_getTypeDependencies_Result();}; new(&m_getTypeDependencies) TypeLookup_getTypeDependencies_Result(); - ; + } return m_getTypeDependencies; diff --git a/src/cpp/statistics/types/monitorservice_types.hpp b/src/cpp/statistics/types/monitorservice_types.hpp index 4e1b69122f3..532982ed6ed 100644 --- a/src/cpp/statistics/types/monitorservice_types.hpp +++ b/src/cpp/statistics/types/monitorservice_types.hpp @@ -2107,7 +2107,7 @@ class MonitorServiceData selected_member_ = 0x00000001; member_destructor_ = [&]() {m_entity_proxy.~vector();}; new(&m_entity_proxy) std::vector(); - ; + } return m_entity_proxy; @@ -2125,7 +2125,7 @@ class MonitorServiceData selected_member_ = 0x00000002; member_destructor_ = [&]() {m_connection_list.~vector();}; new(&m_connection_list) std::vector(); - ; + } return m_connection_list; @@ -2143,7 +2143,7 @@ class MonitorServiceData selected_member_ = 0x00000003; member_destructor_ = [&]() {m_incompatible_qos_status.~IncompatibleQoSStatus_s();}; new(&m_incompatible_qos_status) IncompatibleQoSStatus_s(); - ; + } return m_incompatible_qos_status; @@ -2161,7 +2161,7 @@ class MonitorServiceData selected_member_ = 0x00000004; member_destructor_ = [&]() {m_inconsistent_topic_status.~InconsistentTopicStatus_s();}; new(&m_inconsistent_topic_status) InconsistentTopicStatus_s(); - ; + } return m_inconsistent_topic_status; @@ -2179,7 +2179,7 @@ class MonitorServiceData selected_member_ = 0x00000005; member_destructor_ = [&]() {m_liveliness_lost_status.~LivelinessLostStatus_s();}; new(&m_liveliness_lost_status) LivelinessLostStatus_s(); - ; + } return m_liveliness_lost_status; @@ -2197,7 +2197,7 @@ class MonitorServiceData selected_member_ = 0x00000006; member_destructor_ = [&]() {m_liveliness_changed_status.~LivelinessChangedStatus_s();}; new(&m_liveliness_changed_status) LivelinessChangedStatus_s(); - ; + } return m_liveliness_changed_status; @@ -2215,7 +2215,7 @@ class MonitorServiceData selected_member_ = 0x00000007; member_destructor_ = [&]() {m_deadline_missed_status.~DeadlineMissedStatus_s();}; new(&m_deadline_missed_status) DeadlineMissedStatus_s(); - ; + } return m_deadline_missed_status; @@ -2233,7 +2233,7 @@ class MonitorServiceData selected_member_ = 0x00000008; member_destructor_ = [&]() {m_sample_lost_status.~SampleLostStatus_s();}; new(&m_sample_lost_status) SampleLostStatus_s(); - ; + } return m_sample_lost_status; @@ -2251,7 +2251,7 @@ class MonitorServiceData selected_member_ = 0x00000009; member_destructor_ = nullptr; m_statuses_size = {0}; - ; + } return m_statuses_size; diff --git a/src/cpp/statistics/types/types.hpp b/src/cpp/statistics/types/types.hpp index a07f0fb7abf..a1ed98228ca 100644 --- a/src/cpp/statistics/types/types.hpp +++ b/src/cpp/statistics/types/types.hpp @@ -3767,7 +3767,7 @@ class Data selected_member_ = 0x00000001; member_destructor_ = [&]() {m_writer_reader_data.~WriterReaderData();}; new(&m_writer_reader_data) WriterReaderData(); - ; + } return m_writer_reader_data; @@ -3785,7 +3785,7 @@ class Data selected_member_ = 0x00000002; member_destructor_ = [&]() {m_locator2locator_data.~Locator2LocatorData();}; new(&m_locator2locator_data) Locator2LocatorData(); - ; + } return m_locator2locator_data; @@ -3803,7 +3803,7 @@ class Data selected_member_ = 0x00000003; member_destructor_ = [&]() {m_entity_data.~EntityData();}; new(&m_entity_data) EntityData(); - ; + } return m_entity_data; @@ -3821,7 +3821,7 @@ class Data selected_member_ = 0x00000004; member_destructor_ = [&]() {m_entity2locator_traffic.~Entity2LocatorTraffic();}; new(&m_entity2locator_traffic) Entity2LocatorTraffic(); - ; + } return m_entity2locator_traffic; @@ -3839,7 +3839,7 @@ class Data selected_member_ = 0x00000005; member_destructor_ = [&]() {m_entity_count.~EntityCount();}; new(&m_entity_count) EntityCount(); - ; + } return m_entity_count; @@ -3857,7 +3857,7 @@ class Data selected_member_ = 0x00000006; member_destructor_ = [&]() {m_discovery_time.~DiscoveryTime();}; new(&m_discovery_time) DiscoveryTime(); - ; + } return m_discovery_time; @@ -3875,7 +3875,7 @@ class Data selected_member_ = 0x00000007; member_destructor_ = [&]() {m_sample_identity_count.~SampleIdentityCount();}; new(&m_sample_identity_count) SampleIdentityCount(); - ; + } return m_sample_identity_count; @@ -3893,7 +3893,7 @@ class Data selected_member_ = 0x00000008; member_destructor_ = [&]() {m_physical_data.~PhysicalData();}; new(&m_physical_data) PhysicalData(); - ; + } return m_physical_data; diff --git a/test/blackbox/types/core/core_types.hpp b/test/blackbox/types/core/core_types.hpp index d4c4d6f9c4c..4ebd26bc8cd 100644 --- a/test/blackbox/types/core/core_types.hpp +++ b/test/blackbox/types/core/core_types.hpp @@ -4102,7 +4102,10 @@ class Submessage */ eProsima_user_DllExport Submessage() { - unknown_submsg_(); + selected_member_ = 0x00000005; + member_destructor_ = [&]() {m_unknown_submsg.~SubmessageHeader();}; + new(&m_unknown_submsg) SubmessageHeader(); + } /*! @@ -4652,7 +4655,7 @@ class Submessage selected_member_ = 0x00000001; member_destructor_ = [&]() {m_heartbeat_submsg.~HeartBeatSubmessage();}; new(&m_heartbeat_submsg) HeartBeatSubmessage(); - ; + } return m_heartbeat_submsg; @@ -4670,7 +4673,7 @@ class Submessage selected_member_ = 0x00000002; member_destructor_ = [&]() {m_info_ts_submsg.~InfoTimestampSubmessage();}; new(&m_info_ts_submsg) InfoTimestampSubmessage(); - ; + } return m_info_ts_submsg; @@ -4688,7 +4691,7 @@ class Submessage selected_member_ = 0x00000003; member_destructor_ = [&]() {m_info_src_submsg.~InfoSourceSubmessage();}; new(&m_info_src_submsg) InfoSourceSubmessage(); - ; + } return m_info_src_submsg; @@ -4706,7 +4709,7 @@ class Submessage selected_member_ = 0x00000004; member_destructor_ = [&]() {m_info_dst_submsg.~InfoDestinationSubmessage();}; new(&m_info_dst_submsg) InfoDestinationSubmessage(); - ; + } return m_info_dst_submsg; @@ -4724,7 +4727,7 @@ class Submessage selected_member_ = 0x00000005; member_destructor_ = [&]() {m_unknown_submsg.~SubmessageHeader();}; new(&m_unknown_submsg) SubmessageHeader(); - ; + } return m_unknown_submsg; diff --git a/test/blackbox/types/statistics/monitorservice_types.hpp b/test/blackbox/types/statistics/monitorservice_types.hpp index 4e1b69122f3..532982ed6ed 100644 --- a/test/blackbox/types/statistics/monitorservice_types.hpp +++ b/test/blackbox/types/statistics/monitorservice_types.hpp @@ -2107,7 +2107,7 @@ class MonitorServiceData selected_member_ = 0x00000001; member_destructor_ = [&]() {m_entity_proxy.~vector();}; new(&m_entity_proxy) std::vector(); - ; + } return m_entity_proxy; @@ -2125,7 +2125,7 @@ class MonitorServiceData selected_member_ = 0x00000002; member_destructor_ = [&]() {m_connection_list.~vector();}; new(&m_connection_list) std::vector(); - ; + } return m_connection_list; @@ -2143,7 +2143,7 @@ class MonitorServiceData selected_member_ = 0x00000003; member_destructor_ = [&]() {m_incompatible_qos_status.~IncompatibleQoSStatus_s();}; new(&m_incompatible_qos_status) IncompatibleQoSStatus_s(); - ; + } return m_incompatible_qos_status; @@ -2161,7 +2161,7 @@ class MonitorServiceData selected_member_ = 0x00000004; member_destructor_ = [&]() {m_inconsistent_topic_status.~InconsistentTopicStatus_s();}; new(&m_inconsistent_topic_status) InconsistentTopicStatus_s(); - ; + } return m_inconsistent_topic_status; @@ -2179,7 +2179,7 @@ class MonitorServiceData selected_member_ = 0x00000005; member_destructor_ = [&]() {m_liveliness_lost_status.~LivelinessLostStatus_s();}; new(&m_liveliness_lost_status) LivelinessLostStatus_s(); - ; + } return m_liveliness_lost_status; @@ -2197,7 +2197,7 @@ class MonitorServiceData selected_member_ = 0x00000006; member_destructor_ = [&]() {m_liveliness_changed_status.~LivelinessChangedStatus_s();}; new(&m_liveliness_changed_status) LivelinessChangedStatus_s(); - ; + } return m_liveliness_changed_status; @@ -2215,7 +2215,7 @@ class MonitorServiceData selected_member_ = 0x00000007; member_destructor_ = [&]() {m_deadline_missed_status.~DeadlineMissedStatus_s();}; new(&m_deadline_missed_status) DeadlineMissedStatus_s(); - ; + } return m_deadline_missed_status; @@ -2233,7 +2233,7 @@ class MonitorServiceData selected_member_ = 0x00000008; member_destructor_ = [&]() {m_sample_lost_status.~SampleLostStatus_s();}; new(&m_sample_lost_status) SampleLostStatus_s(); - ; + } return m_sample_lost_status; @@ -2251,7 +2251,7 @@ class MonitorServiceData selected_member_ = 0x00000009; member_destructor_ = nullptr; m_statuses_size = {0}; - ; + } return m_statuses_size; diff --git a/test/blackbox/types/statistics/types.hpp b/test/blackbox/types/statistics/types.hpp index a07f0fb7abf..a1ed98228ca 100644 --- a/test/blackbox/types/statistics/types.hpp +++ b/test/blackbox/types/statistics/types.hpp @@ -3767,7 +3767,7 @@ class Data selected_member_ = 0x00000001; member_destructor_ = [&]() {m_writer_reader_data.~WriterReaderData();}; new(&m_writer_reader_data) WriterReaderData(); - ; + } return m_writer_reader_data; @@ -3785,7 +3785,7 @@ class Data selected_member_ = 0x00000002; member_destructor_ = [&]() {m_locator2locator_data.~Locator2LocatorData();}; new(&m_locator2locator_data) Locator2LocatorData(); - ; + } return m_locator2locator_data; @@ -3803,7 +3803,7 @@ class Data selected_member_ = 0x00000003; member_destructor_ = [&]() {m_entity_data.~EntityData();}; new(&m_entity_data) EntityData(); - ; + } return m_entity_data; @@ -3821,7 +3821,7 @@ class Data selected_member_ = 0x00000004; member_destructor_ = [&]() {m_entity2locator_traffic.~Entity2LocatorTraffic();}; new(&m_entity2locator_traffic) Entity2LocatorTraffic(); - ; + } return m_entity2locator_traffic; @@ -3839,7 +3839,7 @@ class Data selected_member_ = 0x00000005; member_destructor_ = [&]() {m_entity_count.~EntityCount();}; new(&m_entity_count) EntityCount(); - ; + } return m_entity_count; @@ -3857,7 +3857,7 @@ class Data selected_member_ = 0x00000006; member_destructor_ = [&]() {m_discovery_time.~DiscoveryTime();}; new(&m_discovery_time) DiscoveryTime(); - ; + } return m_discovery_time; @@ -3875,7 +3875,7 @@ class Data selected_member_ = 0x00000007; member_destructor_ = [&]() {m_sample_identity_count.~SampleIdentityCount();}; new(&m_sample_identity_count) SampleIdentityCount(); - ; + } return m_sample_identity_count; @@ -3893,7 +3893,7 @@ class Data selected_member_ = 0x00000008; member_destructor_ = [&]() {m_physical_data.~PhysicalData();}; new(&m_physical_data) PhysicalData(); - ; + } return m_physical_data; diff --git a/test/dds-types-test/constants.hpp b/test/dds-types-test/constants.hpp index 115272af13d..fc77e754a1f 100644 --- a/test/dds-types-test/constants.hpp +++ b/test/dds-types-test/constants.hpp @@ -57,7 +57,7 @@ const int32_t const_long = 23; const uint32_t const_ulong = 6; const int64_t const_longlong = 8; const uint64_t const_ulonglong = 67; -const float const_float = 13.1; +const float const_float = 13.1f; const double const_double = 84.1; const long double const_longdouble = 46.1; const bool const_boolean = true; diff --git a/test/dds-types-test/declarations.hpp b/test/dds-types-test/declarations.hpp index bf2884ec294..ac7b675f166 100644 --- a/test/dds-types-test/declarations.hpp +++ b/test/dds-types-test/declarations.hpp @@ -653,7 +653,7 @@ class ForwardUnion selected_member_ = 0x00000001; member_destructor_ = nullptr; m_case_zero = {0}; - ; + } return m_case_zero; @@ -671,7 +671,7 @@ class ForwardUnion selected_member_ = 0x00000002; member_destructor_ = nullptr; m_case_one = {0}; - ; + } return m_case_one; @@ -1736,7 +1736,7 @@ class ModuledForwardUnion selected_member_ = 0x00000001; member_destructor_ = nullptr; m_case_zero = {0}; - ; + } return m_case_zero; @@ -1754,7 +1754,7 @@ class ModuledForwardUnion selected_member_ = 0x00000002; member_destructor_ = nullptr; m_case_one = {0}; - ; + } return m_case_one; diff --git a/test/dds-types-test/external.hpp b/test/dds-types-test/external.hpp index 396f51ebbd9..069ec1c6e64 100644 --- a/test/dds-types-test/external.hpp +++ b/test/dds-types-test/external.hpp @@ -3719,7 +3719,7 @@ class recursive_union selected_member_ = 0x00000001; member_destructor_ = nullptr; m_l = {0}; - ; + } return m_l; @@ -3737,7 +3737,7 @@ class recursive_union selected_member_ = 0x00000002; member_destructor_ = [&]() {m_c.~recursive_union_container();}; new(&m_c) recursive_union_container(); - ; + } return m_c; @@ -3755,7 +3755,7 @@ class recursive_union selected_member_ = 0x00000003; member_destructor_ = nullptr; m_s = {0}; - ; + } return m_s; @@ -4337,7 +4337,7 @@ class recursive_structure_container selected_member_ = 0x00000001; member_destructor_ = nullptr; m_l = {0}; - ; + } return m_l; @@ -4355,7 +4355,7 @@ class recursive_structure_container selected_member_ = 0x00000002; member_destructor_ = [&]() {m_ext.~external();}; new(&m_ext) eprosima::fastcdr::external(); - ; + } return m_ext; @@ -4373,7 +4373,7 @@ class recursive_structure_container selected_member_ = 0x00000003; member_destructor_ = nullptr; m_s = {0}; - ; + } return m_s; diff --git a/test/dds-types-test/helpers/basic_inner_types.hpp b/test/dds-types-test/helpers/basic_inner_types.hpp index 27097450cdf..1d57b90743e 100644 --- a/test/dds-types-test/helpers/basic_inner_types.hpp +++ b/test/dds-types-test/helpers/basic_inner_types.hpp @@ -362,7 +362,10 @@ class InnerUnionHelper */ eProsima_user_DllExport InnerUnionHelper() { - shortValue_(); + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_shortValue = {0}; + } /*! @@ -719,7 +722,7 @@ class InnerUnionHelper selected_member_ = 0x00000001; member_destructor_ = nullptr; m_longValue = {0}; - ; + } return m_longValue; @@ -737,7 +740,7 @@ class InnerUnionHelper selected_member_ = 0x00000002; member_destructor_ = nullptr; m_floatValue = {0.0}; - ; + } return m_floatValue; @@ -755,7 +758,7 @@ class InnerUnionHelper selected_member_ = 0x00000003; member_destructor_ = nullptr; m_shortValue = {0}; - ; + } return m_shortValue; diff --git a/test/dds-types-test/unions.hpp b/test/dds-types-test/unions.hpp index 73d46cc8e1a..3f16c0f2f78 100644 --- a/test/dds-types-test/unions.hpp +++ b/test/dds-types-test/unions.hpp @@ -299,7 +299,7 @@ class Union_Short selected_member_ = 0x00000001; member_destructor_ = nullptr; m_a = {0}; - ; + } return m_a; @@ -558,7 +558,7 @@ class Union_UShort selected_member_ = 0x00000001; member_destructor_ = nullptr; m_b = {0}; - ; + } return m_b; @@ -817,7 +817,7 @@ class Union_Long selected_member_ = 0x00000001; member_destructor_ = nullptr; m_c = {0}; - ; + } return m_c; @@ -1076,7 +1076,7 @@ class Union_ULong selected_member_ = 0x00000001; member_destructor_ = nullptr; m_d = {0}; - ; + } return m_d; @@ -1335,7 +1335,7 @@ class Union_LongLong selected_member_ = 0x00000001; member_destructor_ = nullptr; m_e = {0}; - ; + } return m_e; @@ -1594,7 +1594,7 @@ class Union_ULongLOng selected_member_ = 0x00000001; member_destructor_ = nullptr; m_f = {0}; - ; + } return m_f; @@ -1853,7 +1853,7 @@ class Union_Float selected_member_ = 0x00000001; member_destructor_ = nullptr; m_g = {0.0}; - ; + } return m_g; @@ -2112,7 +2112,7 @@ class Union_Double selected_member_ = 0x00000001; member_destructor_ = nullptr; m_h = {0.0}; - ; + } return m_h; @@ -2371,7 +2371,7 @@ class Union_LongDouble selected_member_ = 0x00000001; member_destructor_ = nullptr; m_i = {0.0}; - ; + } return m_i; @@ -2630,7 +2630,7 @@ class Union_Boolean selected_member_ = 0x00000001; member_destructor_ = nullptr; m_j = {false}; - ; + } return m_j; @@ -2889,7 +2889,7 @@ class Union_Octet selected_member_ = 0x00000001; member_destructor_ = nullptr; m_k = {0}; - ; + } return m_k; @@ -3148,7 +3148,7 @@ class Union_Char selected_member_ = 0x00000001; member_destructor_ = nullptr; m_l = {0}; - ; + } return m_l; @@ -3407,7 +3407,7 @@ class Union_WChar selected_member_ = 0x00000001; member_destructor_ = nullptr; m_m = {0}; - ; + } return m_m; @@ -3677,7 +3677,7 @@ class Union_String selected_member_ = 0x00000001; member_destructor_ = [&]() {m_n.~basic_string();}; new(&m_n) std::string(); - ; + } return m_n; @@ -3947,7 +3947,7 @@ class Union_WString selected_member_ = 0x00000001; member_destructor_ = [&]() {m_o.~basic_string();}; new(&m_o) std::wstring(); - ; + } return m_o; @@ -4217,7 +4217,7 @@ class Union_BoundedString selected_member_ = 0x00000001; member_destructor_ = [&]() {m_bn.~Inner_alias_bounded_string_helper();}; new(&m_bn) Inner_alias_bounded_string_helper(); - ; + } return m_bn; @@ -4487,7 +4487,7 @@ class Union_BoundedWString selected_member_ = 0x00000001; member_destructor_ = [&]() {m_bo.~Inner_alias_bounded_wstring_helper();}; new(&m_bo) Inner_alias_bounded_wstring_helper(); - ; + } return m_bo; @@ -4746,7 +4746,7 @@ class Union_InnerEnumHelper selected_member_ = 0x00000001; member_destructor_ = nullptr; m_p = {InnerEnumHelper::ENUM_VALUE_1}; - ; + } return m_p; @@ -5016,7 +5016,7 @@ class Union_InnerBitMaskHelper selected_member_ = 0x00000001; member_destructor_ = [&]() {m_q.~InnerBitMaskHelper();}; new(&m_q) InnerBitMaskHelper(); - ; + } return m_q; @@ -5275,7 +5275,7 @@ class Union_InnerAliasHelper selected_member_ = 0x00000001; member_destructor_ = nullptr; m_r = {0}; - ; + } return m_r; @@ -5545,7 +5545,7 @@ class Union_Array selected_member_ = 0x00000001; member_destructor_ = [&]() {m_s.~Inner_alias_array_helper();}; new(&m_s) Inner_alias_array_helper(); - ; + } return m_s; @@ -5815,7 +5815,7 @@ class Union_Sequence selected_member_ = 0x00000001; member_destructor_ = [&]() {m_t.~vector();}; new(&m_t) std::vector(); - ; + } return m_t; @@ -6085,7 +6085,7 @@ class Union_Map selected_member_ = 0x00000001; member_destructor_ = [&]() {m_u.~map();}; new(&m_u) std::map(); - ; + } return m_u; @@ -6355,7 +6355,7 @@ class Union_InnerUnionHelper selected_member_ = 0x00000001; member_destructor_ = [&]() {m_v.~InnerUnionHelper();}; new(&m_v) InnerUnionHelper(); - ; + } return m_v; @@ -6625,7 +6625,7 @@ class Union_InnerStructureHelper selected_member_ = 0x00000001; member_destructor_ = [&]() {m_w.~InnerStructureHelper();}; new(&m_w) InnerStructureHelper(); - ; + } return m_w; @@ -6895,7 +6895,7 @@ class Union_InnerBitsetHelper selected_member_ = 0x00000001; member_destructor_ = [&]() {m_x.~InnerBitsetHelper();}; new(&m_x) InnerBitsetHelper(); - ; + } return m_x; @@ -7223,7 +7223,7 @@ class Union_Discriminator_short selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -7241,7 +7241,7 @@ class Union_Discriminator_short selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -7570,7 +7570,7 @@ class Union_Discriminator_unsigned_short selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -7588,7 +7588,7 @@ class Union_Discriminator_unsigned_short selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -7917,7 +7917,7 @@ class Union_Discriminator_long selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -7935,7 +7935,7 @@ class Union_Discriminator_long selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -8264,7 +8264,7 @@ class Union_Discriminator_unsigned_long selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -8282,7 +8282,7 @@ class Union_Discriminator_unsigned_long selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -8611,7 +8611,7 @@ class Union_Discriminator_long_long selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -8629,7 +8629,7 @@ class Union_Discriminator_long_long selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -8958,7 +8958,7 @@ class Union_Discriminator_unsigned_long_long selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -8976,7 +8976,7 @@ class Union_Discriminator_unsigned_long_long selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -9008,6 +9008,10 @@ class Union_Discriminator_boolean */ eProsima_user_DllExport Union_Discriminator_boolean() { + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; + } /*! @@ -9295,7 +9299,7 @@ class Union_Discriminator_boolean selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -9313,7 +9317,7 @@ class Union_Discriminator_boolean selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -9642,7 +9646,7 @@ class Union_Discriminator_octet selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -9660,7 +9664,7 @@ class Union_Discriminator_octet selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -9989,7 +9993,7 @@ class Union_Discriminator_char selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -10007,7 +10011,7 @@ class Union_Discriminator_char selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -10336,7 +10340,7 @@ class Union_Discriminator_wchar selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -10354,7 +10358,7 @@ class Union_Discriminator_wchar selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -10386,7 +10390,10 @@ class Union_Discriminator_enum */ eProsima_user_DllExport Union_Discriminator_enum() { - third_(); + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_third = {0}; + } /*! @@ -10743,7 +10750,7 @@ class Union_Discriminator_enum selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -10761,7 +10768,7 @@ class Union_Discriminator_enum selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -10779,7 +10786,7 @@ class Union_Discriminator_enum selected_member_ = 0x00000003; member_destructor_ = nullptr; m_third = {0}; - ; + } return m_third; @@ -10812,6 +10819,10 @@ class Union_Discriminator_enum_labels */ eProsima_user_DllExport Union_Discriminator_enum_labels() { + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; + } /*! @@ -11110,7 +11121,7 @@ class Union_Discriminator_enum_labels selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -11128,7 +11139,7 @@ class Union_Discriminator_enum_labels selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -11457,7 +11468,7 @@ class Union_Discriminator_alias selected_member_ = 0x00000001; member_destructor_ = nullptr; m_first = {0}; - ; + } return m_first; @@ -11475,7 +11486,7 @@ class Union_Discriminator_alias selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -12066,7 +12077,7 @@ class Union_Several_Fields selected_member_ = 0x00000001; member_destructor_ = [&]() {m_a.~InnerStructureHelper();}; new(&m_a) InnerStructureHelper(); - ; + } return m_a; @@ -12084,7 +12095,7 @@ class Union_Several_Fields selected_member_ = 0x00000002; member_destructor_ = [&]() {m_b.~InnerEmptyStructureHelper();}; new(&m_b) InnerEmptyStructureHelper(); - ; + } return m_b; @@ -12102,7 +12113,7 @@ class Union_Several_Fields selected_member_ = 0x00000003; member_destructor_ = [&]() {m_c.~Inner_alias_bounded_string_helper();}; new(&m_c) Inner_alias_bounded_string_helper(); - ; + } return m_c; @@ -12120,7 +12131,7 @@ class Union_Several_Fields selected_member_ = 0x00000004; member_destructor_ = [&]() {m_d.~Inner_alias_array_helper();}; new(&m_d) Inner_alias_array_helper(); - ; + } return m_d; @@ -12138,7 +12149,7 @@ class Union_Several_Fields selected_member_ = 0x00000005; member_destructor_ = [&]() {m_e.~Inner_alias_sequence_helper();}; new(&m_e) Inner_alias_sequence_helper(); - ; + } return m_e; @@ -12173,7 +12184,10 @@ class Union_Several_Fields_With_Default */ eProsima_user_DllExport Union_Several_Fields_With_Default() { - f_(); + selected_member_ = 0x00000006; + member_destructor_ = [&]() {m_f.~vector();}; + new(&m_f) std::vector(); + } /*! @@ -12803,7 +12817,7 @@ class Union_Several_Fields_With_Default selected_member_ = 0x00000001; member_destructor_ = [&]() {m_a.~InnerStructureHelper();}; new(&m_a) InnerStructureHelper(); - ; + } return m_a; @@ -12821,7 +12835,7 @@ class Union_Several_Fields_With_Default selected_member_ = 0x00000002; member_destructor_ = [&]() {m_b.~InnerEmptyStructureHelper();}; new(&m_b) InnerEmptyStructureHelper(); - ; + } return m_b; @@ -12839,7 +12853,7 @@ class Union_Several_Fields_With_Default selected_member_ = 0x00000003; member_destructor_ = [&]() {m_c.~Inner_alias_bounded_string_helper();}; new(&m_c) Inner_alias_bounded_string_helper(); - ; + } return m_c; @@ -12857,7 +12871,7 @@ class Union_Several_Fields_With_Default selected_member_ = 0x00000004; member_destructor_ = [&]() {m_d.~Inner_alias_array_helper();}; new(&m_d) Inner_alias_array_helper(); - ; + } return m_d; @@ -12875,7 +12889,7 @@ class Union_Several_Fields_With_Default selected_member_ = 0x00000005; member_destructor_ = [&]() {m_e.~Inner_alias_sequence_helper();}; new(&m_e) Inner_alias_sequence_helper(); - ; + } return m_e; @@ -12893,7 +12907,7 @@ class Union_Several_Fields_With_Default selected_member_ = 0x00000006; member_destructor_ = [&]() {m_f.~vector();}; new(&m_f) std::vector(); - ; + } return m_f; @@ -18382,7 +18396,10 @@ class DefaultAnnotation */ eProsima_user_DllExport DefaultAnnotation() { - a_(); + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_a = {0}; + } /*! @@ -18739,7 +18756,7 @@ class DefaultAnnotation selected_member_ = 0x00000001; member_destructor_ = nullptr; m_a = {0}; - ; + } return m_a; @@ -18757,7 +18774,7 @@ class DefaultAnnotation selected_member_ = 0x00000002; member_destructor_ = nullptr; m_b = {0}; - ; + } return m_b; @@ -18775,7 +18792,7 @@ class DefaultAnnotation selected_member_ = 0x00000003; member_destructor_ = nullptr; m_c = {0}; - ; + } return m_c; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_struct.hpp b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_struct.hpp index f8edadff464..1ac4cfcb699 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_struct.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_struct.hpp @@ -67,7 +67,10 @@ class BasicUnion */ eProsima_user_DllExport BasicUnion() { - second_(); + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; + } /*! @@ -367,7 +370,7 @@ class BasicUnion selected_member_ = 0x00000001; member_destructor_ = [&]() {m_first.~basic_string();}; new(&m_first) std::string(); - ; + } return m_first; @@ -385,7 +388,7 @@ class BasicUnion selected_member_ = 0x00000002; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -417,7 +420,10 @@ class ComplexUnion */ eProsima_user_DllExport ComplexUnion() { - fourth_(); + selected_member_ = 0x00000002; + member_destructor_ = [&]() {m_fourth.~BasicUnion();}; + new(&m_fourth) BasicUnion(); + } /*! @@ -717,7 +723,7 @@ class ComplexUnion selected_member_ = 0x00000001; member_destructor_ = nullptr; m_third = {0}; - ; + } return m_third; @@ -735,7 +741,7 @@ class ComplexUnion selected_member_ = 0x00000002; member_destructor_ = [&]() {m_fourth.~BasicUnion();}; new(&m_fourth) BasicUnion(); - ; + } return m_fourth; diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveType.hpp b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveType.hpp index d50b6af6284..a07e6c0c4d9 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveType.hpp +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveType.hpp @@ -742,7 +742,10 @@ class InnerUnion */ eProsima_user_DllExport InnerUnion() { - second_(); + selected_member_ = 0x00000011; + member_destructor_ = nullptr; + m_second = {0}; + } /*! @@ -1042,7 +1045,7 @@ class InnerUnion selected_member_ = 0x00000010; member_destructor_ = [&]() {m_first.~PrimitivesStruct();}; new(&m_first) PrimitivesStruct(); - ; + } return m_first; @@ -1060,7 +1063,7 @@ class InnerUnion selected_member_ = 0x00000011; member_destructor_ = nullptr; m_second = {0}; - ; + } return m_second; @@ -1092,7 +1095,10 @@ class ComplexUnion */ eProsima_user_DllExport ComplexUnion() { - fourth_(); + selected_member_ = 0x00000002; + member_destructor_ = [&]() {m_fourth.~InnerUnion();}; + new(&m_fourth) InnerUnion(); + } /*! @@ -1392,7 +1398,7 @@ class ComplexUnion selected_member_ = 0x00000001; member_destructor_ = nullptr; m_third = {0}; - ; + } return m_third; @@ -1410,7 +1416,7 @@ class ComplexUnion selected_member_ = 0x00000002; member_destructor_ = [&]() {m_fourth.~InnerUnion();}; new(&m_fourth) InnerUnion(); - ; + } return m_fourth;