From 91f8bfe71133b60c99b51d9c371ee56d67ef6f42 Mon Sep 17 00:00:00 2001 From: eProsima Date: Mon, 7 Oct 2024 10:22:32 +0200 Subject: [PATCH] Refs #21783: Regenerate project types with Fast DDS-Gen v4.0.2 Signed-off-by: eProsima --- .../monitorservice_typesTypeObjectSupport.cxx | 72 +++++++++---------- .../topic_types/typesTypeObjectSupport.cxx | 72 +++++++++---------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/include/fastdds_statistics_backend/topic_types/monitorservice_typesTypeObjectSupport.cxx b/include/fastdds_statistics_backend/topic_types/monitorservice_typesTypeObjectSupport.cxx index 268b97a64..18fd618d0 100644 --- a/include/fastdds_statistics_backend/topic_types/monitorservice_typesTypeObjectSupport.cxx +++ b/include/fastdds_statistics_backend/topic_types/monitorservice_typesTypeObjectSupport.cxx @@ -734,7 +734,7 @@ void register_LivelinessChangedStatus_s_type_identifier( ReturnCode_t return_code_last_publication_handle {eprosima::fastdds::dds::RETCODE_OK}; return_code_last_publication_handle = eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( - "anonymous_array_uint8_t_16", type_ids_last_publication_handle); + "anonymous_array_byte_16", type_ids_last_publication_handle); if (eprosima::fastdds::dds::RETCODE_OK != return_code_last_publication_handle) { @@ -748,31 +748,31 @@ void register_LivelinessChangedStatus_s_type_identifier( "Array element TypeIdentifier unknown to TypeObjectRegistry."); return; } - bool element_identifier_anonymous_array_uint8_t_16_ec {false}; - TypeIdentifier* element_identifier_anonymous_array_uint8_t_16 {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_last_publication_handle, element_identifier_anonymous_array_uint8_t_16_ec))}; - if (!element_identifier_anonymous_array_uint8_t_16_ec) + bool element_identifier_anonymous_array_byte_16_ec {false}; + TypeIdentifier* element_identifier_anonymous_array_byte_16 {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_last_publication_handle, element_identifier_anonymous_array_byte_16_ec))}; + if (!element_identifier_anonymous_array_byte_16_ec) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Array element TypeIdentifier inconsistent."); return; } - EquivalenceKind equiv_kind_anonymous_array_uint8_t_16 = EK_COMPLETE; + EquivalenceKind equiv_kind_anonymous_array_byte_16 = EK_COMPLETE; if (TK_NONE == type_ids_last_publication_handle.type_identifier2()._d()) { - equiv_kind_anonymous_array_uint8_t_16 = EK_BOTH; + equiv_kind_anonymous_array_byte_16 = EK_BOTH; } - CollectionElementFlag element_flags_anonymous_array_uint8_t_16 = 0; - PlainCollectionHeader header_anonymous_array_uint8_t_16 = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_array_uint8_t_16, element_flags_anonymous_array_uint8_t_16); + CollectionElementFlag element_flags_anonymous_array_byte_16 = 0; + PlainCollectionHeader header_anonymous_array_byte_16 = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_array_byte_16, element_flags_anonymous_array_byte_16); { SBoundSeq array_bound_seq; TypeObjectUtils::add_array_dimension(array_bound_seq, static_cast(16)); - PlainArraySElemDefn array_sdefn = TypeObjectUtils::build_plain_array_s_elem_defn(header_anonymous_array_uint8_t_16, array_bound_seq, - eprosima::fastcdr::external(element_identifier_anonymous_array_uint8_t_16)); + PlainArraySElemDefn array_sdefn = TypeObjectUtils::build_plain_array_s_elem_defn(header_anonymous_array_byte_16, array_bound_seq, + eprosima::fastcdr::external(element_identifier_anonymous_array_byte_16)); if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == - TypeObjectUtils::build_and_register_s_array_type_identifier(array_sdefn, "anonymous_array_uint8_t_16", type_ids_last_publication_handle)) + TypeObjectUtils::build_and_register_s_array_type_identifier(array_sdefn, "anonymous_array_byte_16", type_ids_last_publication_handle)) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, - "anonymous_array_uint8_t_16 already registered in TypeObjectRegistry for a different type."); + "anonymous_array_byte_16 already registered in TypeObjectRegistry for a different type."); } } } @@ -857,7 +857,7 @@ void register_DeadlineMissedStatus_s_type_identifier( ReturnCode_t return_code_last_instance_handle {eprosima::fastdds::dds::RETCODE_OK}; return_code_last_instance_handle = eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( - "anonymous_array_uint8_t_16", type_ids_last_instance_handle); + "anonymous_array_byte_16", type_ids_last_instance_handle); if (eprosima::fastdds::dds::RETCODE_OK != return_code_last_instance_handle) { @@ -871,31 +871,31 @@ void register_DeadlineMissedStatus_s_type_identifier( "Array element TypeIdentifier unknown to TypeObjectRegistry."); return; } - bool element_identifier_anonymous_array_uint8_t_16_ec {false}; - TypeIdentifier* element_identifier_anonymous_array_uint8_t_16 {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_last_instance_handle, element_identifier_anonymous_array_uint8_t_16_ec))}; - if (!element_identifier_anonymous_array_uint8_t_16_ec) + bool element_identifier_anonymous_array_byte_16_ec {false}; + TypeIdentifier* element_identifier_anonymous_array_byte_16 {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_last_instance_handle, element_identifier_anonymous_array_byte_16_ec))}; + if (!element_identifier_anonymous_array_byte_16_ec) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Array element TypeIdentifier inconsistent."); return; } - EquivalenceKind equiv_kind_anonymous_array_uint8_t_16 = EK_COMPLETE; + EquivalenceKind equiv_kind_anonymous_array_byte_16 = EK_COMPLETE; if (TK_NONE == type_ids_last_instance_handle.type_identifier2()._d()) { - equiv_kind_anonymous_array_uint8_t_16 = EK_BOTH; + equiv_kind_anonymous_array_byte_16 = EK_BOTH; } - CollectionElementFlag element_flags_anonymous_array_uint8_t_16 = 0; - PlainCollectionHeader header_anonymous_array_uint8_t_16 = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_array_uint8_t_16, element_flags_anonymous_array_uint8_t_16); + CollectionElementFlag element_flags_anonymous_array_byte_16 = 0; + PlainCollectionHeader header_anonymous_array_byte_16 = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_array_byte_16, element_flags_anonymous_array_byte_16); { SBoundSeq array_bound_seq; TypeObjectUtils::add_array_dimension(array_bound_seq, static_cast(16)); - PlainArraySElemDefn array_sdefn = TypeObjectUtils::build_plain_array_s_elem_defn(header_anonymous_array_uint8_t_16, array_bound_seq, - eprosima::fastcdr::external(element_identifier_anonymous_array_uint8_t_16)); + PlainArraySElemDefn array_sdefn = TypeObjectUtils::build_plain_array_s_elem_defn(header_anonymous_array_byte_16, array_bound_seq, + eprosima::fastcdr::external(element_identifier_anonymous_array_byte_16)); if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == - TypeObjectUtils::build_and_register_s_array_type_identifier(array_sdefn, "anonymous_array_uint8_t_16", type_ids_last_instance_handle)) + TypeObjectUtils::build_and_register_s_array_type_identifier(array_sdefn, "anonymous_array_byte_16", type_ids_last_instance_handle)) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, - "anonymous_array_uint8_t_16 already registered in TypeObjectRegistry for a different type."); + "anonymous_array_byte_16 already registered in TypeObjectRegistry for a different type."); } } } @@ -1172,7 +1172,7 @@ void register_MonitorServiceData_type_identifier( { return_code_MonitorServiceData = eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( - "anonymous_sequence_uint8_t_unbounded", type_ids_MonitorServiceData); + "anonymous_sequence_byte_unbounded", type_ids_MonitorServiceData); if (eprosima::fastdds::dds::RETCODE_OK != return_code_MonitorServiceData) { @@ -1186,29 +1186,29 @@ void register_MonitorServiceData_type_identifier( "Sequence element TypeIdentifier unknown to TypeObjectRegistry."); return; } - bool element_identifier_anonymous_sequence_uint8_t_unbounded_ec {false}; - TypeIdentifier* element_identifier_anonymous_sequence_uint8_t_unbounded {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_MonitorServiceData, element_identifier_anonymous_sequence_uint8_t_unbounded_ec))}; - if (!element_identifier_anonymous_sequence_uint8_t_unbounded_ec) + bool element_identifier_anonymous_sequence_byte_unbounded_ec {false}; + TypeIdentifier* element_identifier_anonymous_sequence_byte_unbounded {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_MonitorServiceData, element_identifier_anonymous_sequence_byte_unbounded_ec))}; + if (!element_identifier_anonymous_sequence_byte_unbounded_ec) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Sequence element TypeIdentifier inconsistent."); return; } - EquivalenceKind equiv_kind_anonymous_sequence_uint8_t_unbounded = EK_COMPLETE; + EquivalenceKind equiv_kind_anonymous_sequence_byte_unbounded = EK_COMPLETE; if (TK_NONE == type_ids_MonitorServiceData.type_identifier2()._d()) { - equiv_kind_anonymous_sequence_uint8_t_unbounded = EK_BOTH; + equiv_kind_anonymous_sequence_byte_unbounded = EK_BOTH; } - CollectionElementFlag element_flags_anonymous_sequence_uint8_t_unbounded = 0; - PlainCollectionHeader header_anonymous_sequence_uint8_t_unbounded = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_sequence_uint8_t_unbounded, element_flags_anonymous_sequence_uint8_t_unbounded); + CollectionElementFlag element_flags_anonymous_sequence_byte_unbounded = 0; + PlainCollectionHeader header_anonymous_sequence_byte_unbounded = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_sequence_byte_unbounded, element_flags_anonymous_sequence_byte_unbounded); { SBound bound = 0; - PlainSequenceSElemDefn seq_sdefn = TypeObjectUtils::build_plain_sequence_s_elem_defn(header_anonymous_sequence_uint8_t_unbounded, bound, - eprosima::fastcdr::external(element_identifier_anonymous_sequence_uint8_t_unbounded)); + PlainSequenceSElemDefn seq_sdefn = TypeObjectUtils::build_plain_sequence_s_elem_defn(header_anonymous_sequence_byte_unbounded, bound, + eprosima::fastcdr::external(element_identifier_anonymous_sequence_byte_unbounded)); if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == - TypeObjectUtils::build_and_register_s_sequence_type_identifier(seq_sdefn, "anonymous_sequence_uint8_t_unbounded", type_ids_MonitorServiceData)) + TypeObjectUtils::build_and_register_s_sequence_type_identifier(seq_sdefn, "anonymous_sequence_byte_unbounded", type_ids_MonitorServiceData)) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, - "anonymous_sequence_uint8_t_unbounded already registered in TypeObjectRegistry for a different type."); + "anonymous_sequence_byte_unbounded already registered in TypeObjectRegistry for a different type."); } } } diff --git a/include/fastdds_statistics_backend/topic_types/typesTypeObjectSupport.cxx b/include/fastdds_statistics_backend/topic_types/typesTypeObjectSupport.cxx index d13827cf3..0239ff894 100644 --- a/include/fastdds_statistics_backend/topic_types/typesTypeObjectSupport.cxx +++ b/include/fastdds_statistics_backend/topic_types/typesTypeObjectSupport.cxx @@ -67,7 +67,7 @@ void register_EntityId_s_type_identifier( ReturnCode_t return_code_value {eprosima::fastdds::dds::RETCODE_OK}; return_code_value = eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( - "anonymous_array_uint8_t_4", type_ids_value); + "anonymous_array_byte_4", type_ids_value); if (eprosima::fastdds::dds::RETCODE_OK != return_code_value) { @@ -81,31 +81,31 @@ void register_EntityId_s_type_identifier( "Array element TypeIdentifier unknown to TypeObjectRegistry."); return; } - bool element_identifier_anonymous_array_uint8_t_4_ec {false}; - TypeIdentifier* element_identifier_anonymous_array_uint8_t_4 {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_value, element_identifier_anonymous_array_uint8_t_4_ec))}; - if (!element_identifier_anonymous_array_uint8_t_4_ec) + bool element_identifier_anonymous_array_byte_4_ec {false}; + TypeIdentifier* element_identifier_anonymous_array_byte_4 {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_value, element_identifier_anonymous_array_byte_4_ec))}; + if (!element_identifier_anonymous_array_byte_4_ec) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Array element TypeIdentifier inconsistent."); return; } - EquivalenceKind equiv_kind_anonymous_array_uint8_t_4 = EK_COMPLETE; + EquivalenceKind equiv_kind_anonymous_array_byte_4 = EK_COMPLETE; if (TK_NONE == type_ids_value.type_identifier2()._d()) { - equiv_kind_anonymous_array_uint8_t_4 = EK_BOTH; + equiv_kind_anonymous_array_byte_4 = EK_BOTH; } - CollectionElementFlag element_flags_anonymous_array_uint8_t_4 = 0; - PlainCollectionHeader header_anonymous_array_uint8_t_4 = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_array_uint8_t_4, element_flags_anonymous_array_uint8_t_4); + CollectionElementFlag element_flags_anonymous_array_byte_4 = 0; + PlainCollectionHeader header_anonymous_array_byte_4 = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_array_byte_4, element_flags_anonymous_array_byte_4); { SBoundSeq array_bound_seq; TypeObjectUtils::add_array_dimension(array_bound_seq, static_cast(4)); - PlainArraySElemDefn array_sdefn = TypeObjectUtils::build_plain_array_s_elem_defn(header_anonymous_array_uint8_t_4, array_bound_seq, - eprosima::fastcdr::external(element_identifier_anonymous_array_uint8_t_4)); + PlainArraySElemDefn array_sdefn = TypeObjectUtils::build_plain_array_s_elem_defn(header_anonymous_array_byte_4, array_bound_seq, + eprosima::fastcdr::external(element_identifier_anonymous_array_byte_4)); if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == - TypeObjectUtils::build_and_register_s_array_type_identifier(array_sdefn, "anonymous_array_uint8_t_4", type_ids_value)) + TypeObjectUtils::build_and_register_s_array_type_identifier(array_sdefn, "anonymous_array_byte_4", type_ids_value)) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, - "anonymous_array_uint8_t_4 already registered in TypeObjectRegistry for a different type."); + "anonymous_array_byte_4 already registered in TypeObjectRegistry for a different type."); } } } @@ -160,7 +160,7 @@ void register_GuidPrefix_s_type_identifier( ReturnCode_t return_code_value {eprosima::fastdds::dds::RETCODE_OK}; return_code_value = eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( - "anonymous_array_uint8_t_12", type_ids_value); + "anonymous_array_byte_12", type_ids_value); if (eprosima::fastdds::dds::RETCODE_OK != return_code_value) { @@ -174,31 +174,31 @@ void register_GuidPrefix_s_type_identifier( "Array element TypeIdentifier unknown to TypeObjectRegistry."); return; } - bool element_identifier_anonymous_array_uint8_t_12_ec {false}; - TypeIdentifier* element_identifier_anonymous_array_uint8_t_12 {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_value, element_identifier_anonymous_array_uint8_t_12_ec))}; - if (!element_identifier_anonymous_array_uint8_t_12_ec) + bool element_identifier_anonymous_array_byte_12_ec {false}; + TypeIdentifier* element_identifier_anonymous_array_byte_12 {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_value, element_identifier_anonymous_array_byte_12_ec))}; + if (!element_identifier_anonymous_array_byte_12_ec) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Array element TypeIdentifier inconsistent."); return; } - EquivalenceKind equiv_kind_anonymous_array_uint8_t_12 = EK_COMPLETE; + EquivalenceKind equiv_kind_anonymous_array_byte_12 = EK_COMPLETE; if (TK_NONE == type_ids_value.type_identifier2()._d()) { - equiv_kind_anonymous_array_uint8_t_12 = EK_BOTH; + equiv_kind_anonymous_array_byte_12 = EK_BOTH; } - CollectionElementFlag element_flags_anonymous_array_uint8_t_12 = 0; - PlainCollectionHeader header_anonymous_array_uint8_t_12 = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_array_uint8_t_12, element_flags_anonymous_array_uint8_t_12); + CollectionElementFlag element_flags_anonymous_array_byte_12 = 0; + PlainCollectionHeader header_anonymous_array_byte_12 = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_array_byte_12, element_flags_anonymous_array_byte_12); { SBoundSeq array_bound_seq; TypeObjectUtils::add_array_dimension(array_bound_seq, static_cast(12)); - PlainArraySElemDefn array_sdefn = TypeObjectUtils::build_plain_array_s_elem_defn(header_anonymous_array_uint8_t_12, array_bound_seq, - eprosima::fastcdr::external(element_identifier_anonymous_array_uint8_t_12)); + PlainArraySElemDefn array_sdefn = TypeObjectUtils::build_plain_array_s_elem_defn(header_anonymous_array_byte_12, array_bound_seq, + eprosima::fastcdr::external(element_identifier_anonymous_array_byte_12)); if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == - TypeObjectUtils::build_and_register_s_array_type_identifier(array_sdefn, "anonymous_array_uint8_t_12", type_ids_value)) + TypeObjectUtils::build_and_register_s_array_type_identifier(array_sdefn, "anonymous_array_byte_12", type_ids_value)) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, - "anonymous_array_uint8_t_12 already registered in TypeObjectRegistry for a different type."); + "anonymous_array_byte_12 already registered in TypeObjectRegistry for a different type."); } } } @@ -572,7 +572,7 @@ void register_Locator_s_type_identifier( ReturnCode_t return_code_address {eprosima::fastdds::dds::RETCODE_OK}; return_code_address = eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( - "anonymous_array_uint8_t_16", type_ids_address); + "anonymous_array_byte_16", type_ids_address); if (eprosima::fastdds::dds::RETCODE_OK != return_code_address) { @@ -586,31 +586,31 @@ void register_Locator_s_type_identifier( "Array element TypeIdentifier unknown to TypeObjectRegistry."); return; } - bool element_identifier_anonymous_array_uint8_t_16_ec {false}; - TypeIdentifier* element_identifier_anonymous_array_uint8_t_16 {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_address, element_identifier_anonymous_array_uint8_t_16_ec))}; - if (!element_identifier_anonymous_array_uint8_t_16_ec) + bool element_identifier_anonymous_array_byte_16_ec {false}; + TypeIdentifier* element_identifier_anonymous_array_byte_16 {new TypeIdentifier(TypeObjectUtils::retrieve_complete_type_identifier(type_ids_address, element_identifier_anonymous_array_byte_16_ec))}; + if (!element_identifier_anonymous_array_byte_16_ec) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Array element TypeIdentifier inconsistent."); return; } - EquivalenceKind equiv_kind_anonymous_array_uint8_t_16 = EK_COMPLETE; + EquivalenceKind equiv_kind_anonymous_array_byte_16 = EK_COMPLETE; if (TK_NONE == type_ids_address.type_identifier2()._d()) { - equiv_kind_anonymous_array_uint8_t_16 = EK_BOTH; + equiv_kind_anonymous_array_byte_16 = EK_BOTH; } - CollectionElementFlag element_flags_anonymous_array_uint8_t_16 = 0; - PlainCollectionHeader header_anonymous_array_uint8_t_16 = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_array_uint8_t_16, element_flags_anonymous_array_uint8_t_16); + CollectionElementFlag element_flags_anonymous_array_byte_16 = 0; + PlainCollectionHeader header_anonymous_array_byte_16 = TypeObjectUtils::build_plain_collection_header(equiv_kind_anonymous_array_byte_16, element_flags_anonymous_array_byte_16); { SBoundSeq array_bound_seq; TypeObjectUtils::add_array_dimension(array_bound_seq, static_cast(16)); - PlainArraySElemDefn array_sdefn = TypeObjectUtils::build_plain_array_s_elem_defn(header_anonymous_array_uint8_t_16, array_bound_seq, - eprosima::fastcdr::external(element_identifier_anonymous_array_uint8_t_16)); + PlainArraySElemDefn array_sdefn = TypeObjectUtils::build_plain_array_s_elem_defn(header_anonymous_array_byte_16, array_bound_seq, + eprosima::fastcdr::external(element_identifier_anonymous_array_byte_16)); if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == - TypeObjectUtils::build_and_register_s_array_type_identifier(array_sdefn, "anonymous_array_uint8_t_16", type_ids_address)) + TypeObjectUtils::build_and_register_s_array_type_identifier(array_sdefn, "anonymous_array_byte_16", type_ids_address)) { EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, - "anonymous_array_uint8_t_16 already registered in TypeObjectRegistry for a different type."); + "anonymous_array_byte_16 already registered in TypeObjectRegistry for a different type."); } } }