From 85c75df255d7eceeadbc59b84bef0e38dc7980be Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Fri, 21 Feb 2025 12:29:07 +0100 Subject: [PATCH 01/10] Refs #22835. Add bounded strings to test_complete.idl Signed-off-by: Miguel Company --- fastdds_python/test/types/test_complete.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fastdds_python/test/types/test_complete.idl b/fastdds_python/test/types/test_complete.idl index 2089a597..8e42b3a3 100644 --- a/fastdds_python/test/types/test_complete.idl +++ b/fastdds_python/test/types/test_complete.idl @@ -33,6 +33,7 @@ struct StructType //long double long_double_field; boolean bool_field; string string_field; + string<16> fixed_string_field; Color enum_field; Material enum2_field; eprosima::test2::StructType2 included_module_struct; @@ -57,6 +58,7 @@ struct CompleteTestType //long double long_double_field; boolean bool_field; string string_field; + string<16> fixed_string_field; Color enum_field; Material enum2_field; StructType struct_field; @@ -75,6 +77,7 @@ struct CompleteTestType //@optional long double long_double_opt_field; @optional boolean bool_opt_field; @optional string string_opt_field; + @optional string<16> fixed_string_opt_field; @optional Color enum_opt_field; @optional Material enum2_opt_field; @optional StructType struct_opt_field; @@ -153,6 +156,7 @@ struct KeyedCompleteTestType //long double long_double_field; boolean bool_field; string string_field; + string<16> fixed_string_field; Color enum_field; Material enum2_field; StructType struct_field; @@ -171,6 +175,7 @@ struct KeyedCompleteTestType // @optional long double long_double_opt_field; @optional boolean bool_opt_field; @optional string string_opt_field; + @optional string<16> fixed_string_opt_field; @optional Color enum_opt_field; @optional Material enum2_opt_field; @optional StructType struct_opt_field; From 51f7bfe8f87fcc461025b9a08acd057382fcbfde Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Fri, 21 Feb 2025 12:54:42 +0100 Subject: [PATCH 02/10] Refs #22835. Add bounded strings to test_datareader.py Signed-off-by: Miguel Company --- fastdds_python/test/api/test_datareader.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fastdds_python/test/api/test_datareader.py b/fastdds_python/test/api/test_datareader.py index 5cedbd72..60bd0b8c 100644 --- a/fastdds_python/test/api/test_datareader.py +++ b/fastdds_python/test/api/test_datareader.py @@ -165,6 +165,7 @@ def fill_keyed_complete_test_type(data): data.double_field(1202.5) data.bool_field(True) data.string_field("Test string") + data.fixed_string_field("Fixed string") data.enum_field(pytest.dds_type.Color_MAGENTA) data.enum2_field(pytest.dds_type.Material_METAL) data.struct_field().char_field('\x01') @@ -179,6 +180,7 @@ def fill_keyed_complete_test_type(data): data.struct_field().double_field(1202.5) data.struct_field().bool_field(False) data.struct_field().string_field("Test string") + data.struct_field().fixed_string_field("Fixed string") data.struct_field().enum_field(pytest.dds_type.Color_MAGENTA) data.struct_field().enum2_field(pytest.dds_type.Material_METAL) data.char_opt_field().set_value('\x01') @@ -193,6 +195,7 @@ def fill_keyed_complete_test_type(data): data.double_opt_field().set_value(1202.5) data.bool_opt_field().set_value(True) data.string_opt_field().set_value("Test string") + data.fixed_string_opt_field().set_value("Fixed string") data.enum_opt_field().set_value(pytest.dds_type.Color_MAGENTA) struct_field = pytest.dds_type.StructType() struct_field.char_field('\x01') @@ -207,6 +210,7 @@ def fill_keyed_complete_test_type(data): struct_field.double_field(1202.5) struct_field.bool_field(True) struct_field.string_field("Test string") + struct_field.fixed_string_field("Fixed string") struct_field.enum_field(pytest.dds_type.Color_MAGENTA) struct_field.enum2_field(pytest.dds_type.Material_METAL) data.struct_opt_field().set_value(struct_field) @@ -273,6 +277,7 @@ def check_keyed_complete_test_type(data): assert(data.double_field() == 1202.5) assert(data.bool_field() == True) assert(data.string_field() == "Test string") + assert(data.fixed_string_field() == "Fixed string") assert(data.enum_field() == pytest.dds_type.Color_MAGENTA) assert(data.enum2_field() == pytest.dds_type.Material_METAL) assert(data.struct_field().char_field() == '\x01') @@ -287,6 +292,7 @@ def check_keyed_complete_test_type(data): assert(data.struct_field().double_field() == 1202.5) assert(data.struct_field().bool_field() == False) assert(data.struct_field().string_field() == "Test string") + assert(data.struct_field().fixed_string_field() == "Fixed string") assert(data.struct_field().enum_field() == pytest.dds_type.Color_MAGENTA) assert(data.struct_field().enum2_field() == pytest.dds_type.Material_METAL) assert(data.char_opt_field().has_value()) @@ -313,6 +319,8 @@ def check_keyed_complete_test_type(data): assert(data.bool_opt_field().get_value() == True) assert(data.string_opt_field().has_value()) assert(data.string_opt_field().get_value() == "Test string") + assert(data.fixed_string_opt_field().has_value()) + assert(data.fixed_string_opt_field().get_value() == "Fixed string") assert(data.enum_opt_field().has_value()) assert(data.enum_opt_field().get_value() == pytest.dds_type.Color_MAGENTA) assert(not data.enum2_opt_field().has_value()) @@ -329,6 +337,7 @@ def check_keyed_complete_test_type(data): assert(data.struct_opt_field().double_field() == 1202.5) assert(data.struct_opt_field().bool_field() == True) assert(data.struct_opt_field().string_field() == "Test string") + assert(data.struct_opt_field().fixed_string_field() == "Fixed string") assert(data.struct_opt_field().enum_field() == pytest.dds_type.Color_MAGENTA) assert(data.struct_opt_field().enum2_field() == pytest.dds_type.Material_METAL) assert(data.array_char_field()[0] == '\x01') From 92dfbdbe14bee1d026bdcf01c3329ad638b48cb0 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Fri, 21 Feb 2025 12:59:45 +0100 Subject: [PATCH 03/10] Refs #22835. Regenerate test types. Signed-off-by: Miguel Company --- fastdds_python/test/types/test_complete.hpp | 235 ++++++ fastdds_python/test/types/test_complete.i | 79 +- .../test/types/test_completeCdrAux.hpp | 6 +- .../test/types/test_completeCdrAux.ipp | 779 ++++++++++-------- .../types/test_completeTypeObjectSupport.cxx | 462 ++++++++--- fastdds_python/test/types/test_modules.i | 2 - 6 files changed, 1070 insertions(+), 493 deletions(-) diff --git a/fastdds_python/test/types/test_complete.hpp b/fastdds_python/test/types/test_complete.hpp index 3651df1e..f1a8ce0c 100644 --- a/fastdds_python/test/types/test_complete.hpp +++ b/fastdds_python/test/types/test_complete.hpp @@ -133,6 +133,8 @@ class StructType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -160,6 +162,7 @@ class StructType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; m_included_module_struct = std::move(x.m_included_module_struct); @@ -197,6 +200,8 @@ class StructType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -226,6 +231,7 @@ class StructType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; m_included_module_struct = std::move(x.m_included_module_struct); @@ -251,6 +257,7 @@ class StructType m_double_field == x.m_double_field && m_bool_field == x.m_bool_field && m_string_field == x.m_string_field && + m_fixed_string_field == x.m_fixed_string_field && m_enum_field == x.m_enum_field && m_enum2_field == x.m_enum2_field && m_included_module_struct == x.m_included_module_struct); @@ -624,6 +631,45 @@ class StructType } + /*! + * @brief This function copies the value in member fixed_string_field + * @param _fixed_string_field New value to be copied in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + const eprosima::fastcdr::fixed_string<16>& _fixed_string_field) + { + m_fixed_string_field = _fixed_string_field; + } + + /*! + * @brief This function moves the value in member fixed_string_field + * @param _fixed_string_field New value to be moved in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + eprosima::fastcdr::fixed_string<16>&& _fixed_string_field) + { + m_fixed_string_field = std::move(_fixed_string_field); + } + + /*! + * @brief This function returns a constant reference to member fixed_string_field + * @return Constant reference to member fixed_string_field + */ + eProsima_user_DllExport const eprosima::fastcdr::fixed_string<16>& fixed_string_field() const + { + return m_fixed_string_field; + } + + /*! + * @brief This function returns a reference to member fixed_string_field + * @return Reference to member fixed_string_field + */ + eProsima_user_DllExport eprosima::fastcdr::fixed_string<16>& fixed_string_field() + { + return m_fixed_string_field; + } + + /*! * @brief This function sets a value in member enum_field * @param _enum_field New value for member enum_field @@ -736,6 +782,7 @@ class StructType double m_double_field{0.0}; bool m_bool_field{false}; std::string m_string_field; + eprosima::fastcdr::fixed_string<16> m_fixed_string_field; Color m_enum_field{Color::RED}; Material m_enum2_field{Material::WOOD}; eprosima::test2::StructType2 m_included_module_struct; @@ -796,6 +843,8 @@ class CompleteTestType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -826,6 +875,8 @@ class CompleteTestType m_string_opt_field = x.m_string_opt_field; + m_fixed_string_opt_field = x.m_fixed_string_opt_field; + m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; @@ -937,6 +988,7 @@ class CompleteTestType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; m_struct_field = std::move(x.m_struct_field); @@ -952,6 +1004,7 @@ class CompleteTestType m_double_opt_field = x.m_double_opt_field; m_bool_opt_field = x.m_bool_opt_field; m_string_opt_field = std::move(x.m_string_opt_field); + m_fixed_string_opt_field = std::move(x.m_fixed_string_opt_field); m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; m_struct_opt_field = std::move(x.m_struct_opt_field); @@ -1031,6 +1084,8 @@ class CompleteTestType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -1061,6 +1116,8 @@ class CompleteTestType m_string_opt_field = x.m_string_opt_field; + m_fixed_string_opt_field = x.m_fixed_string_opt_field; + m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; @@ -1174,6 +1231,7 @@ class CompleteTestType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; m_struct_field = std::move(x.m_struct_field); @@ -1189,6 +1247,7 @@ class CompleteTestType m_double_opt_field = x.m_double_opt_field; m_bool_opt_field = x.m_bool_opt_field; m_string_opt_field = std::move(x.m_string_opt_field); + m_fixed_string_opt_field = std::move(x.m_fixed_string_opt_field); m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; m_struct_opt_field = std::move(x.m_struct_opt_field); @@ -1256,6 +1315,7 @@ class CompleteTestType m_double_field == x.m_double_field && m_bool_field == x.m_bool_field && m_string_field == x.m_string_field && + m_fixed_string_field == x.m_fixed_string_field && m_enum_field == x.m_enum_field && m_enum2_field == x.m_enum2_field && m_struct_field == x.m_struct_field && @@ -1271,6 +1331,7 @@ class CompleteTestType m_double_opt_field == x.m_double_opt_field && m_bool_opt_field == x.m_bool_opt_field && m_string_opt_field == x.m_string_opt_field && + m_fixed_string_opt_field == x.m_fixed_string_opt_field && m_enum_opt_field == x.m_enum_opt_field && m_enum2_opt_field == x.m_enum2_opt_field && m_struct_opt_field == x.m_struct_opt_field && @@ -1686,6 +1747,45 @@ class CompleteTestType } + /*! + * @brief This function copies the value in member fixed_string_field + * @param _fixed_string_field New value to be copied in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + const eprosima::fastcdr::fixed_string<16>& _fixed_string_field) + { + m_fixed_string_field = _fixed_string_field; + } + + /*! + * @brief This function moves the value in member fixed_string_field + * @param _fixed_string_field New value to be moved in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + eprosima::fastcdr::fixed_string<16>&& _fixed_string_field) + { + m_fixed_string_field = std::move(_fixed_string_field); + } + + /*! + * @brief This function returns a constant reference to member fixed_string_field + * @return Constant reference to member fixed_string_field + */ + eProsima_user_DllExport const eprosima::fastcdr::fixed_string<16>& fixed_string_field() const + { + return m_fixed_string_field; + } + + /*! + * @brief This function returns a reference to member fixed_string_field + * @return Reference to member fixed_string_field + */ + eProsima_user_DllExport eprosima::fastcdr::fixed_string<16>& fixed_string_field() + { + return m_fixed_string_field; + } + + /*! * @brief This function sets a value in member enum_field * @param _enum_field New value for member enum_field @@ -2251,6 +2351,45 @@ class CompleteTestType } + /*! + * @brief This function copies the value in member fixed_string_opt_field + * @param _fixed_string_opt_field New value to be copied in member fixed_string_opt_field + */ + eProsima_user_DllExport void fixed_string_opt_field( + const eprosima::fastcdr::optional>& _fixed_string_opt_field) + { + m_fixed_string_opt_field = _fixed_string_opt_field; + } + + /*! + * @brief This function moves the value in member fixed_string_opt_field + * @param _fixed_string_opt_field New value to be moved in member fixed_string_opt_field + */ + eProsima_user_DllExport void fixed_string_opt_field( + eprosima::fastcdr::optional>&& _fixed_string_opt_field) + { + m_fixed_string_opt_field = std::move(_fixed_string_opt_field); + } + + /*! + * @brief This function returns a constant reference to member fixed_string_opt_field + * @return Constant reference to member fixed_string_opt_field + */ + eProsima_user_DllExport const eprosima::fastcdr::optional>& fixed_string_opt_field() const + { + return m_fixed_string_opt_field; + } + + /*! + * @brief This function returns a reference to member fixed_string_opt_field + * @return Reference to member fixed_string_opt_field + */ + eProsima_user_DllExport eprosima::fastcdr::optional>& fixed_string_opt_field() + { + return m_fixed_string_opt_field; + } + + /*! * @brief This function copies the value in member enum_opt_field * @param _enum_opt_field New value to be copied in member enum_opt_field @@ -4021,6 +4160,7 @@ class CompleteTestType double m_double_field{0.0}; bool m_bool_field{false}; std::string m_string_field; + eprosima::fastcdr::fixed_string<16> m_fixed_string_field; Color m_enum_field{Color::RED}; Material m_enum2_field{Material::WOOD}; StructType m_struct_field; @@ -4036,6 +4176,7 @@ class CompleteTestType eprosima::fastcdr::optional m_double_opt_field; eprosima::fastcdr::optional m_bool_opt_field; eprosima::fastcdr::optional m_string_opt_field; + eprosima::fastcdr::optional> m_fixed_string_opt_field; eprosima::fastcdr::optional m_enum_opt_field; eprosima::fastcdr::optional m_enum2_opt_field; eprosima::fastcdr::optional m_struct_opt_field; @@ -4138,6 +4279,8 @@ class KeyedCompleteTestType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -4168,6 +4311,8 @@ class KeyedCompleteTestType m_string_opt_field = x.m_string_opt_field; + m_fixed_string_opt_field = x.m_fixed_string_opt_field; + m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; @@ -4280,6 +4425,7 @@ class KeyedCompleteTestType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; m_struct_field = std::move(x.m_struct_field); @@ -4295,6 +4441,7 @@ class KeyedCompleteTestType m_double_opt_field = x.m_double_opt_field; m_bool_opt_field = x.m_bool_opt_field; m_string_opt_field = std::move(x.m_string_opt_field); + m_fixed_string_opt_field = std::move(x.m_fixed_string_opt_field); m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; m_struct_opt_field = std::move(x.m_struct_opt_field); @@ -4376,6 +4523,8 @@ class KeyedCompleteTestType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -4406,6 +4555,8 @@ class KeyedCompleteTestType m_string_opt_field = x.m_string_opt_field; + m_fixed_string_opt_field = x.m_fixed_string_opt_field; + m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; @@ -4520,6 +4671,7 @@ class KeyedCompleteTestType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; m_struct_field = std::move(x.m_struct_field); @@ -4535,6 +4687,7 @@ class KeyedCompleteTestType m_double_opt_field = x.m_double_opt_field; m_bool_opt_field = x.m_bool_opt_field; m_string_opt_field = std::move(x.m_string_opt_field); + m_fixed_string_opt_field = std::move(x.m_fixed_string_opt_field); m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; m_struct_opt_field = std::move(x.m_struct_opt_field); @@ -4603,6 +4756,7 @@ class KeyedCompleteTestType m_double_field == x.m_double_field && m_bool_field == x.m_bool_field && m_string_field == x.m_string_field && + m_fixed_string_field == x.m_fixed_string_field && m_enum_field == x.m_enum_field && m_enum2_field == x.m_enum2_field && m_struct_field == x.m_struct_field && @@ -4618,6 +4772,7 @@ class KeyedCompleteTestType m_double_opt_field == x.m_double_opt_field && m_bool_opt_field == x.m_bool_opt_field && m_string_opt_field == x.m_string_opt_field && + m_fixed_string_opt_field == x.m_fixed_string_opt_field && m_enum_opt_field == x.m_enum_opt_field && m_enum2_opt_field == x.m_enum2_opt_field && m_struct_opt_field == x.m_struct_opt_field && @@ -5062,6 +5217,45 @@ class KeyedCompleteTestType } + /*! + * @brief This function copies the value in member fixed_string_field + * @param _fixed_string_field New value to be copied in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + const eprosima::fastcdr::fixed_string<16>& _fixed_string_field) + { + m_fixed_string_field = _fixed_string_field; + } + + /*! + * @brief This function moves the value in member fixed_string_field + * @param _fixed_string_field New value to be moved in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + eprosima::fastcdr::fixed_string<16>&& _fixed_string_field) + { + m_fixed_string_field = std::move(_fixed_string_field); + } + + /*! + * @brief This function returns a constant reference to member fixed_string_field + * @return Constant reference to member fixed_string_field + */ + eProsima_user_DllExport const eprosima::fastcdr::fixed_string<16>& fixed_string_field() const + { + return m_fixed_string_field; + } + + /*! + * @brief This function returns a reference to member fixed_string_field + * @return Reference to member fixed_string_field + */ + eProsima_user_DllExport eprosima::fastcdr::fixed_string<16>& fixed_string_field() + { + return m_fixed_string_field; + } + + /*! * @brief This function sets a value in member enum_field * @param _enum_field New value for member enum_field @@ -5627,6 +5821,45 @@ class KeyedCompleteTestType } + /*! + * @brief This function copies the value in member fixed_string_opt_field + * @param _fixed_string_opt_field New value to be copied in member fixed_string_opt_field + */ + eProsima_user_DllExport void fixed_string_opt_field( + const eprosima::fastcdr::optional>& _fixed_string_opt_field) + { + m_fixed_string_opt_field = _fixed_string_opt_field; + } + + /*! + * @brief This function moves the value in member fixed_string_opt_field + * @param _fixed_string_opt_field New value to be moved in member fixed_string_opt_field + */ + eProsima_user_DllExport void fixed_string_opt_field( + eprosima::fastcdr::optional>&& _fixed_string_opt_field) + { + m_fixed_string_opt_field = std::move(_fixed_string_opt_field); + } + + /*! + * @brief This function returns a constant reference to member fixed_string_opt_field + * @return Constant reference to member fixed_string_opt_field + */ + eProsima_user_DllExport const eprosima::fastcdr::optional>& fixed_string_opt_field() const + { + return m_fixed_string_opt_field; + } + + /*! + * @brief This function returns a reference to member fixed_string_opt_field + * @return Reference to member fixed_string_opt_field + */ + eProsima_user_DllExport eprosima::fastcdr::optional>& fixed_string_opt_field() + { + return m_fixed_string_opt_field; + } + + /*! * @brief This function copies the value in member enum_opt_field * @param _enum_opt_field New value to be copied in member enum_opt_field @@ -7398,6 +7631,7 @@ class KeyedCompleteTestType double m_double_field{0.0}; bool m_bool_field{false}; std::string m_string_field; + eprosima::fastcdr::fixed_string<16> m_fixed_string_field; Color m_enum_field{Color::RED}; Material m_enum2_field{Material::WOOD}; StructType m_struct_field; @@ -7413,6 +7647,7 @@ class KeyedCompleteTestType eprosima::fastcdr::optional m_double_opt_field; eprosima::fastcdr::optional m_bool_opt_field; eprosima::fastcdr::optional m_string_opt_field; + eprosima::fastcdr::optional> m_fixed_string_opt_field; eprosima::fastcdr::optional m_enum_opt_field; eprosima::fastcdr::optional m_enum2_opt_field; eprosima::fastcdr::optional m_struct_opt_field; diff --git a/fastdds_python/test/types/test_complete.i b/fastdds_python/test/types/test_complete.i index a4b14c0c..ace53e43 100644 --- a/fastdds_python/test/types/test_complete.i +++ b/fastdds_python/test/types/test_complete.i @@ -216,6 +216,17 @@ namespace swig { +%ignore StructType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&); + + +// Overloaded getter methods shadow each other and are equivalent in python +// Const accesors produced constant enums instead of arrays/dictionaries when used +// We ignore them to prevent this +%ignore StructType::fixed_string_field(); +%rename("%s") StructType::fixed_string_field() const; + + + %ignore StructType::enum_field(Color&&); @@ -264,8 +275,6 @@ namespace swig { } } - - //////////////////////////////////////////////////////// // Binding for class CompleteTestType //////////////////////////////////////////////////////// @@ -408,6 +417,17 @@ namespace swig { +%ignore CompleteTestType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&); + + +// Overloaded getter methods shadow each other and are equivalent in python +// Const accesors produced constant enums instead of arrays/dictionaries when used +// We ignore them to prevent this +%ignore CompleteTestType::fixed_string_field(); +%rename("%s") CompleteTestType::fixed_string_field() const; + + + %ignore CompleteTestType::enum_field(Color&&); @@ -705,6 +725,28 @@ namespace swig { +%ignore eprosima::fastcdr::optional::value; +%ignore eprosima::fastcdr::optional::reset; +%template(fixed_string<16>Opt) eprosima::fastcdr::optional>; +%extend eprosima::fastcdr::optional> { + eprosima::fastcdr::fixed_string<16> get_value() const { + return $self->value(); + } + + void set_value(const eprosima::fastcdr::fixed_string<16>& value) { + *$self = value; + } +} +%ignore CompleteTestType::fixed_string_opt_field(eprosima::fastcdr::optional>&&); + +// Overloaded getter methods shadow each other and are equivalent in python +// Const accesors produced constant enums instead of arrays/dictionaries when used +// We ignore them to prevent this +%ignore CompleteTestType::fixed_string_opt_field(); +%rename("%s") CompleteTestType::fixed_string_opt_field() const; + + + %ignore eprosima::fastcdr::optional::value; %ignore eprosima::fastcdr::optional::reset; %template(ColorOpt) eprosima::fastcdr::optional; @@ -1642,6 +1684,17 @@ namespace swig { +%ignore KeyedCompleteTestType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&); + + +// Overloaded getter methods shadow each other and are equivalent in python +// Const accesors produced constant enums instead of arrays/dictionaries when used +// We ignore them to prevent this +%ignore KeyedCompleteTestType::fixed_string_field(); +%rename("%s") KeyedCompleteTestType::fixed_string_field() const; + + + %ignore KeyedCompleteTestType::enum_field(Color&&); @@ -1939,6 +1992,28 @@ namespace swig { +%ignore eprosima::fastcdr::optional::value; +%ignore eprosima::fastcdr::optional::reset; +%template(fixed_string<16>Opt) eprosima::fastcdr::optional>; +%extend eprosima::fastcdr::optional> { + eprosima::fastcdr::fixed_string<16> get_value() const { + return $self->value(); + } + + void set_value(const eprosima::fastcdr::fixed_string<16>& value) { + *$self = value; + } +} +%ignore KeyedCompleteTestType::fixed_string_opt_field(eprosima::fastcdr::optional>&&); + +// Overloaded getter methods shadow each other and are equivalent in python +// Const accesors produced constant enums instead of arrays/dictionaries when used +// We ignore them to prevent this +%ignore KeyedCompleteTestType::fixed_string_opt_field(); +%rename("%s") KeyedCompleteTestType::fixed_string_opt_field() const; + + + %ignore eprosima::fastcdr::optional::value; %ignore eprosima::fastcdr::optional::reset; %template(ColorOpt) eprosima::fastcdr::optional; diff --git a/fastdds_python/test/types/test_completeCdrAux.hpp b/fastdds_python/test/types/test_completeCdrAux.hpp index 577bf239..7797bd37 100644 --- a/fastdds_python/test/types/test_completeCdrAux.hpp +++ b/fastdds_python/test/types/test_completeCdrAux.hpp @@ -24,17 +24,17 @@ #include "test_complete.hpp" -constexpr uint32_t CompleteTestType_max_cdr_typesize {7900UL}; +constexpr uint32_t CompleteTestType_max_cdr_typesize {8204UL}; constexpr uint32_t CompleteTestType_max_key_cdr_typesize {0UL}; -constexpr uint32_t StructType_max_cdr_typesize {656UL}; +constexpr uint32_t StructType_max_cdr_typesize {680UL}; constexpr uint32_t StructType_max_key_cdr_typesize {0UL}; -constexpr uint32_t KeyedCompleteTestType_max_cdr_typesize {7900UL}; +constexpr uint32_t KeyedCompleteTestType_max_cdr_typesize {8204UL}; constexpr uint32_t KeyedCompleteTestType_max_key_cdr_typesize {4UL}; diff --git a/fastdds_python/test/types/test_completeCdrAux.ipp b/fastdds_python/test/types/test_completeCdrAux.ipp index 64da7892..164e731b 100644 --- a/fastdds_python/test/types/test_completeCdrAux.ipp +++ b/fastdds_python/test/types/test_completeCdrAux.ipp @@ -87,12 +87,15 @@ eProsima_user_DllExport size_t calculate_serialized_size( data.string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(12), - data.enum_field(), current_alignment); + data.fixed_string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(13), - data.enum2_field(), current_alignment); + data.enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(14), + data.enum2_field(), current_alignment); + + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(15), data.included_module_struct(), current_alignment); @@ -125,9 +128,10 @@ eProsima_user_DllExport void serialize( << eprosima::fastcdr::MemberId(9) << data.double_field() << eprosima::fastcdr::MemberId(10) << data.bool_field() << eprosima::fastcdr::MemberId(11) << data.string_field() - << eprosima::fastcdr::MemberId(12) << data.enum_field() - << eprosima::fastcdr::MemberId(13) << data.enum2_field() - << eprosima::fastcdr::MemberId(14) << data.included_module_struct() + << eprosima::fastcdr::MemberId(12) << data.fixed_string_field() + << eprosima::fastcdr::MemberId(13) << data.enum_field() + << eprosima::fastcdr::MemberId(14) << data.enum2_field() + << eprosima::fastcdr::MemberId(15) << data.included_module_struct() ; scdr.end_serialize_type(current_state); } @@ -194,14 +198,18 @@ eProsima_user_DllExport void deserialize( break; case 12: - dcdr >> data.enum_field(); + dcdr >> data.fixed_string_field(); break; case 13: - dcdr >> data.enum2_field(); + dcdr >> data.enum_field(); break; case 14: + dcdr >> data.enum2_field(); + break; + + case 15: dcdr >> data.included_module_struct(); break; @@ -248,6 +256,8 @@ void serialize_key( scdr << data.string_field(); + scdr << data.fixed_string_field(); + scdr << data.enum_field(); scdr << data.enum2_field(); @@ -310,183 +320,189 @@ eProsima_user_DllExport size_t calculate_serialized_size( data.string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(12), - data.enum_field(), current_alignment); + data.fixed_string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(13), - data.enum2_field(), current_alignment); + data.enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(14), - data.struct_field(), current_alignment); + data.enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(15), - data.char_opt_field(), current_alignment); + data.struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(16), - data.uint8_opt_field(), current_alignment); + data.char_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(17), - data.int16_opt_field(), current_alignment); + data.uint8_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(18), - data.uint16_opt_field(), current_alignment); + data.int16_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(19), - data.int32_opt_field(), current_alignment); + data.uint16_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(20), - data.uint32_opt_field(), current_alignment); + data.int32_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(21), - data.int64_opt_field(), current_alignment); + data.uint32_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(22), - data.uint64_opt_field(), current_alignment); + data.int64_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(23), - data.float_opt_field(), current_alignment); + data.uint64_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(24), - data.double_opt_field(), current_alignment); + data.float_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(25), - data.bool_opt_field(), current_alignment); + data.double_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(26), - data.string_opt_field(), current_alignment); + data.bool_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(27), - data.enum_opt_field(), current_alignment); + data.string_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(28), - data.enum2_opt_field(), current_alignment); + data.fixed_string_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(29), - data.struct_opt_field(), current_alignment); + data.enum_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(30), - data.array_char_field(), current_alignment); + data.enum2_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(31), - data.array_uint8_field(), current_alignment); + data.struct_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(32), - data.array_int16_field(), current_alignment); + data.array_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(33), - data.array_uint16_field(), current_alignment); + data.array_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(34), - data.array_int32_field(), current_alignment); + data.array_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(35), - data.array_uint32_field(), current_alignment); + data.array_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(36), - data.array_int64_field(), current_alignment); + data.array_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(37), - data.array_uint64_field(), current_alignment); + data.array_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(38), - data.array_float_field(), current_alignment); + data.array_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(39), - data.array_double_field(), current_alignment); + data.array_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(40), - data.array_bool_field(), current_alignment); + data.array_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(41), - data.array_enum_field(), current_alignment); + data.array_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(42), - data.array_enum2_field(), current_alignment); + data.array_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(43), - data.array_struct_field(), current_alignment); + data.array_enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(44), - data.bounded_sequence_char_field(), current_alignment); + data.array_enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(45), - data.bounded_sequence_uint8_field(), current_alignment); + data.array_struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(46), - data.bounded_sequence_int16_field(), current_alignment); + data.bounded_sequence_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(47), - data.bounded_sequence_uint16_field(), current_alignment); + data.bounded_sequence_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(48), - data.bounded_sequence_int32_field(), current_alignment); + data.bounded_sequence_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(49), - data.bounded_sequence_uint32_field(), current_alignment); + data.bounded_sequence_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(50), - data.bounded_sequence_int64_field(), current_alignment); + data.bounded_sequence_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(51), - data.bounded_sequence_uint64_field(), current_alignment); + data.bounded_sequence_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(52), - data.bounded_sequence_float_field(), current_alignment); + data.bounded_sequence_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(53), - data.bounded_sequence_double_field(), current_alignment); + data.bounded_sequence_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(54), - data.bounded_sequence_bool_field(), current_alignment); + data.bounded_sequence_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(55), - data.bounded_sequence_enum_field(), current_alignment); + data.bounded_sequence_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(56), - data.bounded_sequence_enum2_field(), current_alignment); + data.bounded_sequence_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(57), - data.bounded_sequence_struct_field(), current_alignment); + data.bounded_sequence_enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(58), - data.unbounded_sequence_char_field(), current_alignment); + data.bounded_sequence_enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(59), - data.unbounded_sequence_uint8_field(), current_alignment); + data.bounded_sequence_struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(60), - data.unbounded_sequence_int16_field(), current_alignment); + data.unbounded_sequence_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(61), - data.unbounded_sequence_uint16_field(), current_alignment); + data.unbounded_sequence_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(62), - data.unbounded_sequence_int32_field(), current_alignment); + data.unbounded_sequence_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(63), - data.unbounded_sequence_uint32_field(), current_alignment); + data.unbounded_sequence_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(64), - data.unbounded_sequence_int64_field(), current_alignment); + data.unbounded_sequence_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(65), - data.unbounded_sequence_uint64_field(), current_alignment); + data.unbounded_sequence_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(66), - data.unbounded_sequence_float_field(), current_alignment); + data.unbounded_sequence_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(67), - data.unbounded_sequence_double_field(), current_alignment); + data.unbounded_sequence_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(68), - data.unbounded_sequence_bool_field(), current_alignment); + data.unbounded_sequence_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(69), - data.unbounded_sequence_enum_field(), current_alignment); + data.unbounded_sequence_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(70), - data.unbounded_sequence_enum2_field(), current_alignment); + data.unbounded_sequence_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(71), + data.unbounded_sequence_enum_field(), current_alignment); + + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(72), + data.unbounded_sequence_enum2_field(), current_alignment); + + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(73), data.unbounded_sequence_struct_field(), current_alignment); @@ -519,66 +535,68 @@ eProsima_user_DllExport void serialize( << eprosima::fastcdr::MemberId(9) << data.double_field() << eprosima::fastcdr::MemberId(10) << data.bool_field() << eprosima::fastcdr::MemberId(11) << data.string_field() - << eprosima::fastcdr::MemberId(12) << data.enum_field() - << eprosima::fastcdr::MemberId(13) << data.enum2_field() - << eprosima::fastcdr::MemberId(14) << data.struct_field() - << eprosima::fastcdr::MemberId(15) << data.char_opt_field() - << eprosima::fastcdr::MemberId(16) << data.uint8_opt_field() - << eprosima::fastcdr::MemberId(17) << data.int16_opt_field() - << eprosima::fastcdr::MemberId(18) << data.uint16_opt_field() - << eprosima::fastcdr::MemberId(19) << data.int32_opt_field() - << eprosima::fastcdr::MemberId(20) << data.uint32_opt_field() - << eprosima::fastcdr::MemberId(21) << data.int64_opt_field() - << eprosima::fastcdr::MemberId(22) << data.uint64_opt_field() - << eprosima::fastcdr::MemberId(23) << data.float_opt_field() - << eprosima::fastcdr::MemberId(24) << data.double_opt_field() - << eprosima::fastcdr::MemberId(25) << data.bool_opt_field() - << eprosima::fastcdr::MemberId(26) << data.string_opt_field() - << eprosima::fastcdr::MemberId(27) << data.enum_opt_field() - << eprosima::fastcdr::MemberId(28) << data.enum2_opt_field() - << eprosima::fastcdr::MemberId(29) << data.struct_opt_field() - << eprosima::fastcdr::MemberId(30) << data.array_char_field() - << eprosima::fastcdr::MemberId(31) << data.array_uint8_field() - << eprosima::fastcdr::MemberId(32) << data.array_int16_field() - << eprosima::fastcdr::MemberId(33) << data.array_uint16_field() - << eprosima::fastcdr::MemberId(34) << data.array_int32_field() - << eprosima::fastcdr::MemberId(35) << data.array_uint32_field() - << eprosima::fastcdr::MemberId(36) << data.array_int64_field() - << eprosima::fastcdr::MemberId(37) << data.array_uint64_field() - << eprosima::fastcdr::MemberId(38) << data.array_float_field() - << eprosima::fastcdr::MemberId(39) << data.array_double_field() - << eprosima::fastcdr::MemberId(40) << data.array_bool_field() - << eprosima::fastcdr::MemberId(41) << data.array_enum_field() - << eprosima::fastcdr::MemberId(42) << data.array_enum2_field() - << eprosima::fastcdr::MemberId(43) << data.array_struct_field() - << eprosima::fastcdr::MemberId(44) << data.bounded_sequence_char_field() - << eprosima::fastcdr::MemberId(45) << data.bounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(46) << data.bounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_float_field() - << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_double_field() - << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_struct_field() - << eprosima::fastcdr::MemberId(58) << data.unbounded_sequence_char_field() - << eprosima::fastcdr::MemberId(59) << data.unbounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(60) << data.unbounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_float_field() - << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_double_field() - << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(12) << data.fixed_string_field() + << eprosima::fastcdr::MemberId(13) << data.enum_field() + << eprosima::fastcdr::MemberId(14) << data.enum2_field() + << eprosima::fastcdr::MemberId(15) << data.struct_field() + << eprosima::fastcdr::MemberId(16) << data.char_opt_field() + << eprosima::fastcdr::MemberId(17) << data.uint8_opt_field() + << eprosima::fastcdr::MemberId(18) << data.int16_opt_field() + << eprosima::fastcdr::MemberId(19) << data.uint16_opt_field() + << eprosima::fastcdr::MemberId(20) << data.int32_opt_field() + << eprosima::fastcdr::MemberId(21) << data.uint32_opt_field() + << eprosima::fastcdr::MemberId(22) << data.int64_opt_field() + << eprosima::fastcdr::MemberId(23) << data.uint64_opt_field() + << eprosima::fastcdr::MemberId(24) << data.float_opt_field() + << eprosima::fastcdr::MemberId(25) << data.double_opt_field() + << eprosima::fastcdr::MemberId(26) << data.bool_opt_field() + << eprosima::fastcdr::MemberId(27) << data.string_opt_field() + << eprosima::fastcdr::MemberId(28) << data.fixed_string_opt_field() + << eprosima::fastcdr::MemberId(29) << data.enum_opt_field() + << eprosima::fastcdr::MemberId(30) << data.enum2_opt_field() + << eprosima::fastcdr::MemberId(31) << data.struct_opt_field() + << eprosima::fastcdr::MemberId(32) << data.array_char_field() + << eprosima::fastcdr::MemberId(33) << data.array_uint8_field() + << eprosima::fastcdr::MemberId(34) << data.array_int16_field() + << eprosima::fastcdr::MemberId(35) << data.array_uint16_field() + << eprosima::fastcdr::MemberId(36) << data.array_int32_field() + << eprosima::fastcdr::MemberId(37) << data.array_uint32_field() + << eprosima::fastcdr::MemberId(38) << data.array_int64_field() + << eprosima::fastcdr::MemberId(39) << data.array_uint64_field() + << eprosima::fastcdr::MemberId(40) << data.array_float_field() + << eprosima::fastcdr::MemberId(41) << data.array_double_field() + << eprosima::fastcdr::MemberId(42) << data.array_bool_field() + << eprosima::fastcdr::MemberId(43) << data.array_enum_field() + << eprosima::fastcdr::MemberId(44) << data.array_enum2_field() + << eprosima::fastcdr::MemberId(45) << data.array_struct_field() + << eprosima::fastcdr::MemberId(46) << data.bounded_sequence_char_field() + << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_float_field() + << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_double_field() + << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(58) << data.bounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(59) << data.bounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(60) << data.unbounded_sequence_char_field() + << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_float_field() + << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_double_field() + << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(72) << data.unbounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(73) << data.unbounded_sequence_struct_field() ; scdr.end_serialize_type(current_state); } @@ -645,242 +663,250 @@ eProsima_user_DllExport void deserialize( break; case 12: - dcdr >> data.enum_field(); + dcdr >> data.fixed_string_field(); break; case 13: - dcdr >> data.enum2_field(); + dcdr >> data.enum_field(); break; case 14: - dcdr >> data.struct_field(); + dcdr >> data.enum2_field(); break; case 15: - dcdr >> data.char_opt_field(); + dcdr >> data.struct_field(); break; case 16: - dcdr >> data.uint8_opt_field(); + dcdr >> data.char_opt_field(); break; case 17: - dcdr >> data.int16_opt_field(); + dcdr >> data.uint8_opt_field(); break; case 18: - dcdr >> data.uint16_opt_field(); + dcdr >> data.int16_opt_field(); break; case 19: - dcdr >> data.int32_opt_field(); + dcdr >> data.uint16_opt_field(); break; case 20: - dcdr >> data.uint32_opt_field(); + dcdr >> data.int32_opt_field(); break; case 21: - dcdr >> data.int64_opt_field(); + dcdr >> data.uint32_opt_field(); break; case 22: - dcdr >> data.uint64_opt_field(); + dcdr >> data.int64_opt_field(); break; case 23: - dcdr >> data.float_opt_field(); + dcdr >> data.uint64_opt_field(); break; case 24: - dcdr >> data.double_opt_field(); + dcdr >> data.float_opt_field(); break; case 25: - dcdr >> data.bool_opt_field(); + dcdr >> data.double_opt_field(); break; case 26: - dcdr >> data.string_opt_field(); + dcdr >> data.bool_opt_field(); break; case 27: - dcdr >> data.enum_opt_field(); + dcdr >> data.string_opt_field(); break; case 28: - dcdr >> data.enum2_opt_field(); + dcdr >> data.fixed_string_opt_field(); break; case 29: - dcdr >> data.struct_opt_field(); + dcdr >> data.enum_opt_field(); break; case 30: - dcdr >> data.array_char_field(); + dcdr >> data.enum2_opt_field(); break; case 31: - dcdr >> data.array_uint8_field(); + dcdr >> data.struct_opt_field(); break; case 32: - dcdr >> data.array_int16_field(); + dcdr >> data.array_char_field(); break; case 33: - dcdr >> data.array_uint16_field(); + dcdr >> data.array_uint8_field(); break; case 34: - dcdr >> data.array_int32_field(); + dcdr >> data.array_int16_field(); break; case 35: - dcdr >> data.array_uint32_field(); + dcdr >> data.array_uint16_field(); break; case 36: - dcdr >> data.array_int64_field(); + dcdr >> data.array_int32_field(); break; case 37: - dcdr >> data.array_uint64_field(); + dcdr >> data.array_uint32_field(); break; case 38: - dcdr >> data.array_float_field(); + dcdr >> data.array_int64_field(); break; case 39: - dcdr >> data.array_double_field(); + dcdr >> data.array_uint64_field(); break; case 40: - dcdr >> data.array_bool_field(); + dcdr >> data.array_float_field(); break; case 41: - dcdr >> data.array_enum_field(); + dcdr >> data.array_double_field(); break; case 42: - dcdr >> data.array_enum2_field(); + dcdr >> data.array_bool_field(); break; case 43: - dcdr >> data.array_struct_field(); + dcdr >> data.array_enum_field(); break; case 44: - dcdr >> data.bounded_sequence_char_field(); + dcdr >> data.array_enum2_field(); break; case 45: - dcdr >> data.bounded_sequence_uint8_field(); + dcdr >> data.array_struct_field(); break; case 46: - dcdr >> data.bounded_sequence_int16_field(); + dcdr >> data.bounded_sequence_char_field(); break; case 47: - dcdr >> data.bounded_sequence_uint16_field(); + dcdr >> data.bounded_sequence_uint8_field(); break; case 48: - dcdr >> data.bounded_sequence_int32_field(); + dcdr >> data.bounded_sequence_int16_field(); break; case 49: - dcdr >> data.bounded_sequence_uint32_field(); + dcdr >> data.bounded_sequence_uint16_field(); break; case 50: - dcdr >> data.bounded_sequence_int64_field(); + dcdr >> data.bounded_sequence_int32_field(); break; case 51: - dcdr >> data.bounded_sequence_uint64_field(); + dcdr >> data.bounded_sequence_uint32_field(); break; case 52: - dcdr >> data.bounded_sequence_float_field(); + dcdr >> data.bounded_sequence_int64_field(); break; case 53: - dcdr >> data.bounded_sequence_double_field(); + dcdr >> data.bounded_sequence_uint64_field(); break; case 54: - dcdr >> data.bounded_sequence_bool_field(); + dcdr >> data.bounded_sequence_float_field(); break; case 55: - dcdr >> data.bounded_sequence_enum_field(); + dcdr >> data.bounded_sequence_double_field(); break; case 56: - dcdr >> data.bounded_sequence_enum2_field(); + dcdr >> data.bounded_sequence_bool_field(); break; case 57: - dcdr >> data.bounded_sequence_struct_field(); + dcdr >> data.bounded_sequence_enum_field(); break; case 58: - dcdr >> data.unbounded_sequence_char_field(); + dcdr >> data.bounded_sequence_enum2_field(); break; case 59: - dcdr >> data.unbounded_sequence_uint8_field(); + dcdr >> data.bounded_sequence_struct_field(); break; case 60: - dcdr >> data.unbounded_sequence_int16_field(); + dcdr >> data.unbounded_sequence_char_field(); break; case 61: - dcdr >> data.unbounded_sequence_uint16_field(); + dcdr >> data.unbounded_sequence_uint8_field(); break; case 62: - dcdr >> data.unbounded_sequence_int32_field(); + dcdr >> data.unbounded_sequence_int16_field(); break; case 63: - dcdr >> data.unbounded_sequence_uint32_field(); + dcdr >> data.unbounded_sequence_uint16_field(); break; case 64: - dcdr >> data.unbounded_sequence_int64_field(); + dcdr >> data.unbounded_sequence_int32_field(); break; case 65: - dcdr >> data.unbounded_sequence_uint64_field(); + dcdr >> data.unbounded_sequence_uint32_field(); break; case 66: - dcdr >> data.unbounded_sequence_float_field(); + dcdr >> data.unbounded_sequence_int64_field(); break; case 67: - dcdr >> data.unbounded_sequence_double_field(); + dcdr >> data.unbounded_sequence_uint64_field(); break; case 68: - dcdr >> data.unbounded_sequence_bool_field(); + dcdr >> data.unbounded_sequence_float_field(); break; case 69: - dcdr >> data.unbounded_sequence_enum_field(); + dcdr >> data.unbounded_sequence_double_field(); break; case 70: - dcdr >> data.unbounded_sequence_enum2_field(); + dcdr >> data.unbounded_sequence_bool_field(); break; case 71: + dcdr >> data.unbounded_sequence_enum_field(); + break; + + case 72: + dcdr >> data.unbounded_sequence_enum2_field(); + break; + + case 73: dcdr >> data.unbounded_sequence_struct_field(); break; @@ -914,6 +940,7 @@ void serialize_key( + extern void serialize_key( Cdr& scdr, const StructType& data); @@ -987,6 +1014,8 @@ void serialize_key( scdr << data.string_field(); + scdr << data.fixed_string_field(); + scdr << data.enum_field(); scdr << data.enum2_field(); @@ -1053,6 +1082,11 @@ void serialize_key( scdr << data.string_opt_field().value(); } + if (data.fixed_string_opt_field().has_value()) + { + scdr << data.fixed_string_opt_field().value(); + } + if (data.enum_opt_field().has_value()) { scdr << data.enum_opt_field().value(); @@ -1211,183 +1245,189 @@ eProsima_user_DllExport size_t calculate_serialized_size( data.string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(13), - data.enum_field(), current_alignment); + data.fixed_string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(14), - data.enum2_field(), current_alignment); + data.enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(15), - data.struct_field(), current_alignment); + data.enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(16), - data.char_opt_field(), current_alignment); + data.struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(17), - data.uint8_opt_field(), current_alignment); + data.char_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(18), - data.int16_opt_field(), current_alignment); + data.uint8_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(19), - data.uint16_opt_field(), current_alignment); + data.int16_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(20), - data.int32_opt_field(), current_alignment); + data.uint16_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(21), - data.uint32_opt_field(), current_alignment); + data.int32_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(22), - data.int64_opt_field(), current_alignment); + data.uint32_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(23), - data.uint64_opt_field(), current_alignment); + data.int64_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(24), - data.float_opt_field(), current_alignment); + data.uint64_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(25), - data.double_opt_field(), current_alignment); + data.float_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(26), - data.bool_opt_field(), current_alignment); + data.double_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(27), - data.string_opt_field(), current_alignment); + data.bool_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(28), - data.enum_opt_field(), current_alignment); + data.string_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(29), - data.enum2_opt_field(), current_alignment); + data.fixed_string_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(30), - data.struct_opt_field(), current_alignment); + data.enum_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(31), - data.array_char_field(), current_alignment); + data.enum2_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(32), - data.array_uint8_field(), current_alignment); + data.struct_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(33), - data.array_int16_field(), current_alignment); + data.array_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(34), - data.array_uint16_field(), current_alignment); + data.array_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(35), - data.array_int32_field(), current_alignment); + data.array_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(36), - data.array_uint32_field(), current_alignment); + data.array_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(37), - data.array_int64_field(), current_alignment); + data.array_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(38), - data.array_uint64_field(), current_alignment); + data.array_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(39), - data.array_float_field(), current_alignment); + data.array_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(40), - data.array_double_field(), current_alignment); + data.array_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(41), - data.array_bool_field(), current_alignment); + data.array_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(42), - data.array_enum_field(), current_alignment); + data.array_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(43), - data.array_enum2_field(), current_alignment); + data.array_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(44), - data.array_struct_field(), current_alignment); + data.array_enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(45), - data.bounded_sequence_char_field(), current_alignment); + data.array_enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(46), - data.bounded_sequence_uint8_field(), current_alignment); + data.array_struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(47), - data.bounded_sequence_int16_field(), current_alignment); + data.bounded_sequence_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(48), - data.bounded_sequence_uint16_field(), current_alignment); + data.bounded_sequence_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(49), - data.bounded_sequence_int32_field(), current_alignment); + data.bounded_sequence_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(50), - data.bounded_sequence_uint32_field(), current_alignment); + data.bounded_sequence_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(51), - data.bounded_sequence_int64_field(), current_alignment); + data.bounded_sequence_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(52), - data.bounded_sequence_uint64_field(), current_alignment); + data.bounded_sequence_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(53), - data.bounded_sequence_float_field(), current_alignment); + data.bounded_sequence_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(54), - data.bounded_sequence_double_field(), current_alignment); + data.bounded_sequence_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(55), - data.bounded_sequence_bool_field(), current_alignment); + data.bounded_sequence_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(56), - data.bounded_sequence_enum_field(), current_alignment); + data.bounded_sequence_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(57), - data.bounded_sequence_enum2_field(), current_alignment); + data.bounded_sequence_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(58), - data.bounded_sequence_struct_field(), current_alignment); + data.bounded_sequence_enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(59), - data.unbounded_sequence_char_field(), current_alignment); + data.bounded_sequence_enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(60), - data.unbounded_sequence_uint8_field(), current_alignment); + data.bounded_sequence_struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(61), - data.unbounded_sequence_int16_field(), current_alignment); + data.unbounded_sequence_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(62), - data.unbounded_sequence_uint16_field(), current_alignment); + data.unbounded_sequence_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(63), - data.unbounded_sequence_int32_field(), current_alignment); + data.unbounded_sequence_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(64), - data.unbounded_sequence_uint32_field(), current_alignment); + data.unbounded_sequence_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(65), - data.unbounded_sequence_int64_field(), current_alignment); + data.unbounded_sequence_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(66), - data.unbounded_sequence_uint64_field(), current_alignment); + data.unbounded_sequence_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(67), - data.unbounded_sequence_float_field(), current_alignment); + data.unbounded_sequence_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(68), - data.unbounded_sequence_double_field(), current_alignment); + data.unbounded_sequence_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(69), - data.unbounded_sequence_bool_field(), current_alignment); + data.unbounded_sequence_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(70), - data.unbounded_sequence_enum_field(), current_alignment); + data.unbounded_sequence_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(71), - data.unbounded_sequence_enum2_field(), current_alignment); + data.unbounded_sequence_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(72), + data.unbounded_sequence_enum_field(), current_alignment); + + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(73), + data.unbounded_sequence_enum2_field(), current_alignment); + + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(74), data.unbounded_sequence_struct_field(), current_alignment); @@ -1421,66 +1461,68 @@ eProsima_user_DllExport void serialize( << eprosima::fastcdr::MemberId(10) << data.double_field() << eprosima::fastcdr::MemberId(11) << data.bool_field() << eprosima::fastcdr::MemberId(12) << data.string_field() - << eprosima::fastcdr::MemberId(13) << data.enum_field() - << eprosima::fastcdr::MemberId(14) << data.enum2_field() - << eprosima::fastcdr::MemberId(15) << data.struct_field() - << eprosima::fastcdr::MemberId(16) << data.char_opt_field() - << eprosima::fastcdr::MemberId(17) << data.uint8_opt_field() - << eprosima::fastcdr::MemberId(18) << data.int16_opt_field() - << eprosima::fastcdr::MemberId(19) << data.uint16_opt_field() - << eprosima::fastcdr::MemberId(20) << data.int32_opt_field() - << eprosima::fastcdr::MemberId(21) << data.uint32_opt_field() - << eprosima::fastcdr::MemberId(22) << data.int64_opt_field() - << eprosima::fastcdr::MemberId(23) << data.uint64_opt_field() - << eprosima::fastcdr::MemberId(24) << data.float_opt_field() - << eprosima::fastcdr::MemberId(25) << data.double_opt_field() - << eprosima::fastcdr::MemberId(26) << data.bool_opt_field() - << eprosima::fastcdr::MemberId(27) << data.string_opt_field() - << eprosima::fastcdr::MemberId(28) << data.enum_opt_field() - << eprosima::fastcdr::MemberId(29) << data.enum2_opt_field() - << eprosima::fastcdr::MemberId(30) << data.struct_opt_field() - << eprosima::fastcdr::MemberId(31) << data.array_char_field() - << eprosima::fastcdr::MemberId(32) << data.array_uint8_field() - << eprosima::fastcdr::MemberId(33) << data.array_int16_field() - << eprosima::fastcdr::MemberId(34) << data.array_uint16_field() - << eprosima::fastcdr::MemberId(35) << data.array_int32_field() - << eprosima::fastcdr::MemberId(36) << data.array_uint32_field() - << eprosima::fastcdr::MemberId(37) << data.array_int64_field() - << eprosima::fastcdr::MemberId(38) << data.array_uint64_field() - << eprosima::fastcdr::MemberId(39) << data.array_float_field() - << eprosima::fastcdr::MemberId(40) << data.array_double_field() - << eprosima::fastcdr::MemberId(41) << data.array_bool_field() - << eprosima::fastcdr::MemberId(42) << data.array_enum_field() - << eprosima::fastcdr::MemberId(43) << data.array_enum2_field() - << eprosima::fastcdr::MemberId(44) << data.array_struct_field() - << eprosima::fastcdr::MemberId(45) << data.bounded_sequence_char_field() - << eprosima::fastcdr::MemberId(46) << data.bounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_float_field() - << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_double_field() - << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(58) << data.bounded_sequence_struct_field() - << eprosima::fastcdr::MemberId(59) << data.unbounded_sequence_char_field() - << eprosima::fastcdr::MemberId(60) << data.unbounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_float_field() - << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_double_field() - << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(72) << data.unbounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(13) << data.fixed_string_field() + << eprosima::fastcdr::MemberId(14) << data.enum_field() + << eprosima::fastcdr::MemberId(15) << data.enum2_field() + << eprosima::fastcdr::MemberId(16) << data.struct_field() + << eprosima::fastcdr::MemberId(17) << data.char_opt_field() + << eprosima::fastcdr::MemberId(18) << data.uint8_opt_field() + << eprosima::fastcdr::MemberId(19) << data.int16_opt_field() + << eprosima::fastcdr::MemberId(20) << data.uint16_opt_field() + << eprosima::fastcdr::MemberId(21) << data.int32_opt_field() + << eprosima::fastcdr::MemberId(22) << data.uint32_opt_field() + << eprosima::fastcdr::MemberId(23) << data.int64_opt_field() + << eprosima::fastcdr::MemberId(24) << data.uint64_opt_field() + << eprosima::fastcdr::MemberId(25) << data.float_opt_field() + << eprosima::fastcdr::MemberId(26) << data.double_opt_field() + << eprosima::fastcdr::MemberId(27) << data.bool_opt_field() + << eprosima::fastcdr::MemberId(28) << data.string_opt_field() + << eprosima::fastcdr::MemberId(29) << data.fixed_string_opt_field() + << eprosima::fastcdr::MemberId(30) << data.enum_opt_field() + << eprosima::fastcdr::MemberId(31) << data.enum2_opt_field() + << eprosima::fastcdr::MemberId(32) << data.struct_opt_field() + << eprosima::fastcdr::MemberId(33) << data.array_char_field() + << eprosima::fastcdr::MemberId(34) << data.array_uint8_field() + << eprosima::fastcdr::MemberId(35) << data.array_int16_field() + << eprosima::fastcdr::MemberId(36) << data.array_uint16_field() + << eprosima::fastcdr::MemberId(37) << data.array_int32_field() + << eprosima::fastcdr::MemberId(38) << data.array_uint32_field() + << eprosima::fastcdr::MemberId(39) << data.array_int64_field() + << eprosima::fastcdr::MemberId(40) << data.array_uint64_field() + << eprosima::fastcdr::MemberId(41) << data.array_float_field() + << eprosima::fastcdr::MemberId(42) << data.array_double_field() + << eprosima::fastcdr::MemberId(43) << data.array_bool_field() + << eprosima::fastcdr::MemberId(44) << data.array_enum_field() + << eprosima::fastcdr::MemberId(45) << data.array_enum2_field() + << eprosima::fastcdr::MemberId(46) << data.array_struct_field() + << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_char_field() + << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_float_field() + << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_double_field() + << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(58) << data.bounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(59) << data.bounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(60) << data.bounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_char_field() + << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_float_field() + << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_double_field() + << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(72) << data.unbounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(73) << data.unbounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(74) << data.unbounded_sequence_struct_field() ; scdr.end_serialize_type(current_state); } @@ -1551,242 +1593,250 @@ eProsima_user_DllExport void deserialize( break; case 13: - dcdr >> data.enum_field(); + dcdr >> data.fixed_string_field(); break; case 14: - dcdr >> data.enum2_field(); + dcdr >> data.enum_field(); break; case 15: - dcdr >> data.struct_field(); + dcdr >> data.enum2_field(); break; case 16: - dcdr >> data.char_opt_field(); + dcdr >> data.struct_field(); break; case 17: - dcdr >> data.uint8_opt_field(); + dcdr >> data.char_opt_field(); break; case 18: - dcdr >> data.int16_opt_field(); + dcdr >> data.uint8_opt_field(); break; case 19: - dcdr >> data.uint16_opt_field(); + dcdr >> data.int16_opt_field(); break; case 20: - dcdr >> data.int32_opt_field(); + dcdr >> data.uint16_opt_field(); break; case 21: - dcdr >> data.uint32_opt_field(); + dcdr >> data.int32_opt_field(); break; case 22: - dcdr >> data.int64_opt_field(); + dcdr >> data.uint32_opt_field(); break; case 23: - dcdr >> data.uint64_opt_field(); + dcdr >> data.int64_opt_field(); break; case 24: - dcdr >> data.float_opt_field(); + dcdr >> data.uint64_opt_field(); break; case 25: - dcdr >> data.double_opt_field(); + dcdr >> data.float_opt_field(); break; case 26: - dcdr >> data.bool_opt_field(); + dcdr >> data.double_opt_field(); break; case 27: - dcdr >> data.string_opt_field(); + dcdr >> data.bool_opt_field(); break; case 28: - dcdr >> data.enum_opt_field(); + dcdr >> data.string_opt_field(); break; case 29: - dcdr >> data.enum2_opt_field(); + dcdr >> data.fixed_string_opt_field(); break; case 30: - dcdr >> data.struct_opt_field(); + dcdr >> data.enum_opt_field(); break; case 31: - dcdr >> data.array_char_field(); + dcdr >> data.enum2_opt_field(); break; case 32: - dcdr >> data.array_uint8_field(); + dcdr >> data.struct_opt_field(); break; case 33: - dcdr >> data.array_int16_field(); + dcdr >> data.array_char_field(); break; case 34: - dcdr >> data.array_uint16_field(); + dcdr >> data.array_uint8_field(); break; case 35: - dcdr >> data.array_int32_field(); + dcdr >> data.array_int16_field(); break; case 36: - dcdr >> data.array_uint32_field(); + dcdr >> data.array_uint16_field(); break; case 37: - dcdr >> data.array_int64_field(); + dcdr >> data.array_int32_field(); break; case 38: - dcdr >> data.array_uint64_field(); + dcdr >> data.array_uint32_field(); break; case 39: - dcdr >> data.array_float_field(); + dcdr >> data.array_int64_field(); break; case 40: - dcdr >> data.array_double_field(); + dcdr >> data.array_uint64_field(); break; case 41: - dcdr >> data.array_bool_field(); + dcdr >> data.array_float_field(); break; case 42: - dcdr >> data.array_enum_field(); + dcdr >> data.array_double_field(); break; case 43: - dcdr >> data.array_enum2_field(); + dcdr >> data.array_bool_field(); break; case 44: - dcdr >> data.array_struct_field(); + dcdr >> data.array_enum_field(); break; case 45: - dcdr >> data.bounded_sequence_char_field(); + dcdr >> data.array_enum2_field(); break; case 46: - dcdr >> data.bounded_sequence_uint8_field(); + dcdr >> data.array_struct_field(); break; case 47: - dcdr >> data.bounded_sequence_int16_field(); + dcdr >> data.bounded_sequence_char_field(); break; case 48: - dcdr >> data.bounded_sequence_uint16_field(); + dcdr >> data.bounded_sequence_uint8_field(); break; case 49: - dcdr >> data.bounded_sequence_int32_field(); + dcdr >> data.bounded_sequence_int16_field(); break; case 50: - dcdr >> data.bounded_sequence_uint32_field(); + dcdr >> data.bounded_sequence_uint16_field(); break; case 51: - dcdr >> data.bounded_sequence_int64_field(); + dcdr >> data.bounded_sequence_int32_field(); break; case 52: - dcdr >> data.bounded_sequence_uint64_field(); + dcdr >> data.bounded_sequence_uint32_field(); break; case 53: - dcdr >> data.bounded_sequence_float_field(); + dcdr >> data.bounded_sequence_int64_field(); break; case 54: - dcdr >> data.bounded_sequence_double_field(); + dcdr >> data.bounded_sequence_uint64_field(); break; case 55: - dcdr >> data.bounded_sequence_bool_field(); + dcdr >> data.bounded_sequence_float_field(); break; case 56: - dcdr >> data.bounded_sequence_enum_field(); + dcdr >> data.bounded_sequence_double_field(); break; case 57: - dcdr >> data.bounded_sequence_enum2_field(); + dcdr >> data.bounded_sequence_bool_field(); break; case 58: - dcdr >> data.bounded_sequence_struct_field(); + dcdr >> data.bounded_sequence_enum_field(); break; case 59: - dcdr >> data.unbounded_sequence_char_field(); + dcdr >> data.bounded_sequence_enum2_field(); break; case 60: - dcdr >> data.unbounded_sequence_uint8_field(); + dcdr >> data.bounded_sequence_struct_field(); break; case 61: - dcdr >> data.unbounded_sequence_int16_field(); + dcdr >> data.unbounded_sequence_char_field(); break; case 62: - dcdr >> data.unbounded_sequence_uint16_field(); + dcdr >> data.unbounded_sequence_uint8_field(); break; case 63: - dcdr >> data.unbounded_sequence_int32_field(); + dcdr >> data.unbounded_sequence_int16_field(); break; case 64: - dcdr >> data.unbounded_sequence_uint32_field(); + dcdr >> data.unbounded_sequence_uint16_field(); break; case 65: - dcdr >> data.unbounded_sequence_int64_field(); + dcdr >> data.unbounded_sequence_int32_field(); break; case 66: - dcdr >> data.unbounded_sequence_uint64_field(); + dcdr >> data.unbounded_sequence_uint32_field(); break; case 67: - dcdr >> data.unbounded_sequence_float_field(); + dcdr >> data.unbounded_sequence_int64_field(); break; case 68: - dcdr >> data.unbounded_sequence_double_field(); + dcdr >> data.unbounded_sequence_uint64_field(); break; case 69: - dcdr >> data.unbounded_sequence_bool_field(); + dcdr >> data.unbounded_sequence_float_field(); break; case 70: - dcdr >> data.unbounded_sequence_enum_field(); + dcdr >> data.unbounded_sequence_double_field(); break; case 71: - dcdr >> data.unbounded_sequence_enum2_field(); + dcdr >> data.unbounded_sequence_bool_field(); break; case 72: + dcdr >> data.unbounded_sequence_enum_field(); + break; + + case 73: + dcdr >> data.unbounded_sequence_enum2_field(); + break; + + case 74: dcdr >> data.unbounded_sequence_struct_field(); break; @@ -1820,6 +1870,7 @@ void serialize_key( + extern void serialize_key( Cdr& scdr, const StructType& data); @@ -1940,6 +1991,8 @@ void serialize_key( + + diff --git a/fastdds_python/test/types/test_completeTypeObjectSupport.cxx b/fastdds_python/test/types/test_completeTypeObjectSupport.cxx index e5d3b5b0..44f5d661 100644 --- a/fastdds_python/test/types/test_completeTypeObjectSupport.cxx +++ b/fastdds_python/test/types/test_completeTypeObjectSupport.cxx @@ -581,6 +581,44 @@ void register_StructType_type_identifier( CompleteStructMember member_string_field = TypeObjectUtils::build_complete_struct_member(common_string_field, detail_string_field); TypeObjectUtils::add_complete_struct_member(member_seq_StructType, member_string_field); } + { + TypeIdentifierPair type_ids_fixed_string_field; + ReturnCode_t return_code_fixed_string_field {eprosima::fastdds::dds::RETCODE_OK}; + return_code_fixed_string_field = + eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( + "anonymous_string_16", type_ids_fixed_string_field); + + if (eprosima::fastdds::dds::RETCODE_OK != return_code_fixed_string_field) + { + { + SBound bound = static_cast(16); + StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound); + if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == + TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn, + "anonymous_string_16", type_ids_fixed_string_field)) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, + "anonymous_string_16 already registered in TypeObjectRegistry for a different type."); + } + } + } + StructMemberFlag member_flags_fixed_string_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, + false, false, false, false); + MemberId member_id_fixed_string_field = 0x0000000c; + bool common_fixed_string_field_ec {false}; + CommonStructMember common_fixed_string_field {TypeObjectUtils::build_common_struct_member(member_id_fixed_string_field, member_flags_fixed_string_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_fixed_string_field, common_fixed_string_field_ec))}; + if (!common_fixed_string_field_ec) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure fixed_string_field member TypeIdentifier inconsistent."); + return; + } + MemberName name_fixed_string_field = "fixed_string_field"; + eprosima::fastcdr::optional member_ann_builtin_fixed_string_field; + ann_custom_StructType.reset(); + CompleteMemberDetail detail_fixed_string_field = TypeObjectUtils::build_complete_member_detail(name_fixed_string_field, member_ann_builtin_fixed_string_field, ann_custom_StructType); + CompleteStructMember member_fixed_string_field = TypeObjectUtils::build_complete_struct_member(common_fixed_string_field, detail_fixed_string_field); + TypeObjectUtils::add_complete_struct_member(member_seq_StructType, member_fixed_string_field); + } { TypeIdentifierPair type_ids_enum_field; ReturnCode_t return_code_enum_field {eprosima::fastdds::dds::RETCODE_OK}; @@ -594,7 +632,7 @@ void register_StructType_type_identifier( } StructMemberFlag member_flags_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum_field = 0x0000000c; + MemberId member_id_enum_field = 0x0000000d; bool common_enum_field_ec {false}; CommonStructMember common_enum_field {TypeObjectUtils::build_common_struct_member(member_id_enum_field, member_flags_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_field, common_enum_field_ec))}; if (!common_enum_field_ec) @@ -622,7 +660,7 @@ void register_StructType_type_identifier( } StructMemberFlag member_flags_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum2_field = 0x0000000d; + MemberId member_id_enum2_field = 0x0000000e; bool common_enum2_field_ec {false}; CommonStructMember common_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_field, member_flags_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_field, common_enum2_field_ec))}; if (!common_enum2_field_ec) @@ -650,7 +688,7 @@ void register_StructType_type_identifier( } StructMemberFlag member_flags_included_module_struct = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_included_module_struct = 0x0000000e; + MemberId member_id_included_module_struct = 0x0000000f; bool common_included_module_struct_ec {false}; CommonStructMember common_included_module_struct {TypeObjectUtils::build_common_struct_member(member_id_included_module_struct, member_flags_included_module_struct, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_included_module_struct, common_included_module_struct_ec))}; if (!common_included_module_struct_ec) @@ -1062,6 +1100,44 @@ void register_CompleteTestType_type_identifier( CompleteStructMember member_string_field = TypeObjectUtils::build_complete_struct_member(common_string_field, detail_string_field); TypeObjectUtils::add_complete_struct_member(member_seq_CompleteTestType, member_string_field); } + { + TypeIdentifierPair type_ids_fixed_string_field; + ReturnCode_t return_code_fixed_string_field {eprosima::fastdds::dds::RETCODE_OK}; + return_code_fixed_string_field = + eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( + "anonymous_string_16", type_ids_fixed_string_field); + + if (eprosima::fastdds::dds::RETCODE_OK != return_code_fixed_string_field) + { + { + SBound bound = static_cast(16); + StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound); + if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == + TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn, + "anonymous_string_16", type_ids_fixed_string_field)) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, + "anonymous_string_16 already registered in TypeObjectRegistry for a different type."); + } + } + } + StructMemberFlag member_flags_fixed_string_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, + false, false, false, false); + MemberId member_id_fixed_string_field = 0x0000000c; + bool common_fixed_string_field_ec {false}; + CommonStructMember common_fixed_string_field {TypeObjectUtils::build_common_struct_member(member_id_fixed_string_field, member_flags_fixed_string_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_fixed_string_field, common_fixed_string_field_ec))}; + if (!common_fixed_string_field_ec) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure fixed_string_field member TypeIdentifier inconsistent."); + return; + } + MemberName name_fixed_string_field = "fixed_string_field"; + eprosima::fastcdr::optional member_ann_builtin_fixed_string_field; + ann_custom_CompleteTestType.reset(); + CompleteMemberDetail detail_fixed_string_field = TypeObjectUtils::build_complete_member_detail(name_fixed_string_field, member_ann_builtin_fixed_string_field, ann_custom_CompleteTestType); + CompleteStructMember member_fixed_string_field = TypeObjectUtils::build_complete_struct_member(common_fixed_string_field, detail_fixed_string_field); + TypeObjectUtils::add_complete_struct_member(member_seq_CompleteTestType, member_fixed_string_field); + } { TypeIdentifierPair type_ids_enum_field; ReturnCode_t return_code_enum_field {eprosima::fastdds::dds::RETCODE_OK}; @@ -1075,7 +1151,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum_field = 0x0000000c; + MemberId member_id_enum_field = 0x0000000d; bool common_enum_field_ec {false}; CommonStructMember common_enum_field {TypeObjectUtils::build_common_struct_member(member_id_enum_field, member_flags_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_field, common_enum_field_ec))}; if (!common_enum_field_ec) @@ -1103,7 +1179,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum2_field = 0x0000000d; + MemberId member_id_enum2_field = 0x0000000e; bool common_enum2_field_ec {false}; CommonStructMember common_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_field, member_flags_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_field, common_enum2_field_ec))}; if (!common_enum2_field_ec) @@ -1131,7 +1207,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_struct_field = 0x0000000e; + MemberId member_id_struct_field = 0x0000000f; bool common_struct_field_ec {false}; CommonStructMember common_struct_field {TypeObjectUtils::build_common_struct_member(member_id_struct_field, member_flags_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_struct_field, common_struct_field_ec))}; if (!common_struct_field_ec) @@ -1161,7 +1237,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_char_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_char_opt_field = 0x0000000f; + MemberId member_id_char_opt_field = 0x00000010; bool common_char_opt_field_ec {false}; CommonStructMember common_char_opt_field {TypeObjectUtils::build_common_struct_member(member_id_char_opt_field, member_flags_char_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_char_opt_field, common_char_opt_field_ec))}; if (!common_char_opt_field_ec) @@ -1204,7 +1280,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_uint8_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint8_opt_field = 0x00000010; + MemberId member_id_uint8_opt_field = 0x00000011; bool common_uint8_opt_field_ec {false}; CommonStructMember common_uint8_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint8_opt_field, member_flags_uint8_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint8_opt_field, common_uint8_opt_field_ec))}; if (!common_uint8_opt_field_ec) @@ -1247,7 +1323,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_int16_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int16_opt_field = 0x00000011; + MemberId member_id_int16_opt_field = 0x00000012; bool common_int16_opt_field_ec {false}; CommonStructMember common_int16_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int16_opt_field, member_flags_int16_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int16_opt_field, common_int16_opt_field_ec))}; if (!common_int16_opt_field_ec) @@ -1290,7 +1366,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_uint16_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint16_opt_field = 0x00000012; + MemberId member_id_uint16_opt_field = 0x00000013; bool common_uint16_opt_field_ec {false}; CommonStructMember common_uint16_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint16_opt_field, member_flags_uint16_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint16_opt_field, common_uint16_opt_field_ec))}; if (!common_uint16_opt_field_ec) @@ -1333,7 +1409,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_int32_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int32_opt_field = 0x00000013; + MemberId member_id_int32_opt_field = 0x00000014; bool common_int32_opt_field_ec {false}; CommonStructMember common_int32_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int32_opt_field, member_flags_int32_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int32_opt_field, common_int32_opt_field_ec))}; if (!common_int32_opt_field_ec) @@ -1376,7 +1452,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_uint32_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint32_opt_field = 0x00000014; + MemberId member_id_uint32_opt_field = 0x00000015; bool common_uint32_opt_field_ec {false}; CommonStructMember common_uint32_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint32_opt_field, member_flags_uint32_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint32_opt_field, common_uint32_opt_field_ec))}; if (!common_uint32_opt_field_ec) @@ -1419,7 +1495,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_int64_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int64_opt_field = 0x00000015; + MemberId member_id_int64_opt_field = 0x00000016; bool common_int64_opt_field_ec {false}; CommonStructMember common_int64_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int64_opt_field, member_flags_int64_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int64_opt_field, common_int64_opt_field_ec))}; if (!common_int64_opt_field_ec) @@ -1462,7 +1538,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_uint64_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint64_opt_field = 0x00000016; + MemberId member_id_uint64_opt_field = 0x00000017; bool common_uint64_opt_field_ec {false}; CommonStructMember common_uint64_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint64_opt_field, member_flags_uint64_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint64_opt_field, common_uint64_opt_field_ec))}; if (!common_uint64_opt_field_ec) @@ -1505,7 +1581,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_float_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_float_opt_field = 0x00000017; + MemberId member_id_float_opt_field = 0x00000018; bool common_float_opt_field_ec {false}; CommonStructMember common_float_opt_field {TypeObjectUtils::build_common_struct_member(member_id_float_opt_field, member_flags_float_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_float_opt_field, common_float_opt_field_ec))}; if (!common_float_opt_field_ec) @@ -1548,7 +1624,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_double_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_double_opt_field = 0x00000018; + MemberId member_id_double_opt_field = 0x00000019; bool common_double_opt_field_ec {false}; CommonStructMember common_double_opt_field {TypeObjectUtils::build_common_struct_member(member_id_double_opt_field, member_flags_double_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_double_opt_field, common_double_opt_field_ec))}; if (!common_double_opt_field_ec) @@ -1591,7 +1667,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bool_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_bool_opt_field = 0x00000019; + MemberId member_id_bool_opt_field = 0x0000001a; bool common_bool_opt_field_ec {false}; CommonStructMember common_bool_opt_field {TypeObjectUtils::build_common_struct_member(member_id_bool_opt_field, member_flags_bool_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bool_opt_field, common_bool_opt_field_ec))}; if (!common_bool_opt_field_ec) @@ -1642,7 +1718,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_string_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_string_opt_field = 0x0000001a; + MemberId member_id_string_opt_field = 0x0000001b; bool common_string_opt_field_ec {false}; CommonStructMember common_string_opt_field {TypeObjectUtils::build_common_struct_member(member_id_string_opt_field, member_flags_string_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_string_opt_field, common_string_opt_field_ec))}; if (!common_string_opt_field_ec) @@ -1670,6 +1746,57 @@ void register_CompleteTestType_type_identifier( CompleteStructMember member_string_opt_field = TypeObjectUtils::build_complete_struct_member(common_string_opt_field, detail_string_opt_field); TypeObjectUtils::add_complete_struct_member(member_seq_CompleteTestType, member_string_opt_field); } + { + TypeIdentifierPair type_ids_fixed_string_opt_field; + ReturnCode_t return_code_fixed_string_opt_field {eprosima::fastdds::dds::RETCODE_OK}; + return_code_fixed_string_opt_field = + eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( + "anonymous_string_16", type_ids_fixed_string_opt_field); + + if (eprosima::fastdds::dds::RETCODE_OK != return_code_fixed_string_opt_field) + { + { + SBound bound = static_cast(16); + StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound); + if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == + TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn, + "anonymous_string_16", type_ids_fixed_string_opt_field)) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, + "anonymous_string_16 already registered in TypeObjectRegistry for a different type."); + } + } + } + StructMemberFlag member_flags_fixed_string_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, + true, false, false, false); + MemberId member_id_fixed_string_opt_field = 0x0000001c; + bool common_fixed_string_opt_field_ec {false}; + CommonStructMember common_fixed_string_opt_field {TypeObjectUtils::build_common_struct_member(member_id_fixed_string_opt_field, member_flags_fixed_string_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_fixed_string_opt_field, common_fixed_string_opt_field_ec))}; + if (!common_fixed_string_opt_field_ec) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure fixed_string_opt_field member TypeIdentifier inconsistent."); + return; + } + MemberName name_fixed_string_opt_field = "fixed_string_opt_field"; + eprosima::fastcdr::optional member_ann_builtin_fixed_string_opt_field; + ann_custom_CompleteTestType.reset(); + AppliedAnnotationSeq tmp_ann_custom_fixed_string_opt_field; + eprosima::fastcdr::optional unit_fixed_string_opt_field; + eprosima::fastcdr::optional min_fixed_string_opt_field; + eprosima::fastcdr::optional max_fixed_string_opt_field; + eprosima::fastcdr::optional hash_id_fixed_string_opt_field; + if (unit_fixed_string_opt_field.has_value() || min_fixed_string_opt_field.has_value() || max_fixed_string_opt_field.has_value() || hash_id_fixed_string_opt_field.has_value()) + { + member_ann_builtin_fixed_string_opt_field = TypeObjectUtils::build_applied_builtin_member_annotations(unit_fixed_string_opt_field, min_fixed_string_opt_field, max_fixed_string_opt_field, hash_id_fixed_string_opt_field); + } + if (!tmp_ann_custom_fixed_string_opt_field.empty()) + { + ann_custom_CompleteTestType = tmp_ann_custom_fixed_string_opt_field; + } + CompleteMemberDetail detail_fixed_string_opt_field = TypeObjectUtils::build_complete_member_detail(name_fixed_string_opt_field, member_ann_builtin_fixed_string_opt_field, ann_custom_CompleteTestType); + CompleteStructMember member_fixed_string_opt_field = TypeObjectUtils::build_complete_struct_member(common_fixed_string_opt_field, detail_fixed_string_opt_field); + TypeObjectUtils::add_complete_struct_member(member_seq_CompleteTestType, member_fixed_string_opt_field); + } { TypeIdentifierPair type_ids_enum_opt_field; ReturnCode_t return_code_enum_opt_field {eprosima::fastdds::dds::RETCODE_OK}; @@ -1683,7 +1810,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_enum_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum_opt_field = 0x0000001b; + MemberId member_id_enum_opt_field = 0x0000001d; bool common_enum_opt_field_ec {false}; CommonStructMember common_enum_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum_opt_field, member_flags_enum_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_opt_field, common_enum_opt_field_ec))}; if (!common_enum_opt_field_ec) @@ -1724,7 +1851,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_enum2_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum2_opt_field = 0x0000001c; + MemberId member_id_enum2_opt_field = 0x0000001e; bool common_enum2_opt_field_ec {false}; CommonStructMember common_enum2_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_opt_field, member_flags_enum2_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_opt_field, common_enum2_opt_field_ec))}; if (!common_enum2_opt_field_ec) @@ -1765,7 +1892,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_struct_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_struct_opt_field = 0x0000001d; + MemberId member_id_struct_opt_field = 0x0000001f; bool common_struct_opt_field_ec {false}; CommonStructMember common_struct_opt_field {TypeObjectUtils::build_common_struct_member(member_id_struct_opt_field, member_flags_struct_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_struct_opt_field, common_struct_opt_field_ec))}; if (!common_struct_opt_field_ec) @@ -1842,7 +1969,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_char_field = 0x0000001e; + MemberId member_id_array_char_field = 0x00000020; bool common_array_char_field_ec {false}; CommonStructMember common_array_char_field {TypeObjectUtils::build_common_struct_member(member_id_array_char_field, member_flags_array_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_char_field, common_array_char_field_ec))}; if (!common_array_char_field_ec) @@ -1906,7 +2033,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint8_field = 0x0000001f; + MemberId member_id_array_uint8_field = 0x00000021; bool common_array_uint8_field_ec {false}; CommonStructMember common_array_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint8_field, member_flags_array_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint8_field, common_array_uint8_field_ec))}; if (!common_array_uint8_field_ec) @@ -1970,7 +2097,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int16_field = 0x00000020; + MemberId member_id_array_int16_field = 0x00000022; bool common_array_int16_field_ec {false}; CommonStructMember common_array_int16_field {TypeObjectUtils::build_common_struct_member(member_id_array_int16_field, member_flags_array_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int16_field, common_array_int16_field_ec))}; if (!common_array_int16_field_ec) @@ -2034,7 +2161,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint16_field = 0x00000021; + MemberId member_id_array_uint16_field = 0x00000023; bool common_array_uint16_field_ec {false}; CommonStructMember common_array_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint16_field, member_flags_array_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint16_field, common_array_uint16_field_ec))}; if (!common_array_uint16_field_ec) @@ -2098,7 +2225,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int32_field = 0x00000022; + MemberId member_id_array_int32_field = 0x00000024; bool common_array_int32_field_ec {false}; CommonStructMember common_array_int32_field {TypeObjectUtils::build_common_struct_member(member_id_array_int32_field, member_flags_array_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int32_field, common_array_int32_field_ec))}; if (!common_array_int32_field_ec) @@ -2162,7 +2289,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint32_field = 0x00000023; + MemberId member_id_array_uint32_field = 0x00000025; bool common_array_uint32_field_ec {false}; CommonStructMember common_array_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint32_field, member_flags_array_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint32_field, common_array_uint32_field_ec))}; if (!common_array_uint32_field_ec) @@ -2226,7 +2353,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int64_field = 0x00000024; + MemberId member_id_array_int64_field = 0x00000026; bool common_array_int64_field_ec {false}; CommonStructMember common_array_int64_field {TypeObjectUtils::build_common_struct_member(member_id_array_int64_field, member_flags_array_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int64_field, common_array_int64_field_ec))}; if (!common_array_int64_field_ec) @@ -2290,7 +2417,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint64_field = 0x00000025; + MemberId member_id_array_uint64_field = 0x00000027; bool common_array_uint64_field_ec {false}; CommonStructMember common_array_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint64_field, member_flags_array_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint64_field, common_array_uint64_field_ec))}; if (!common_array_uint64_field_ec) @@ -2354,7 +2481,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_float_field = 0x00000026; + MemberId member_id_array_float_field = 0x00000028; bool common_array_float_field_ec {false}; CommonStructMember common_array_float_field {TypeObjectUtils::build_common_struct_member(member_id_array_float_field, member_flags_array_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_float_field, common_array_float_field_ec))}; if (!common_array_float_field_ec) @@ -2418,7 +2545,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_double_field = 0x00000027; + MemberId member_id_array_double_field = 0x00000029; bool common_array_double_field_ec {false}; CommonStructMember common_array_double_field {TypeObjectUtils::build_common_struct_member(member_id_array_double_field, member_flags_array_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_double_field, common_array_double_field_ec))}; if (!common_array_double_field_ec) @@ -2482,7 +2609,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_bool_field = 0x00000028; + MemberId member_id_array_bool_field = 0x0000002a; bool common_array_bool_field_ec {false}; CommonStructMember common_array_bool_field {TypeObjectUtils::build_common_struct_member(member_id_array_bool_field, member_flags_array_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_bool_field, common_array_bool_field_ec))}; if (!common_array_bool_field_ec) @@ -2544,7 +2671,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum_field = 0x00000029; + MemberId member_id_array_enum_field = 0x0000002b; bool common_array_enum_field_ec {false}; CommonStructMember common_array_enum_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum_field, member_flags_array_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum_field, common_array_enum_field_ec))}; if (!common_array_enum_field_ec) @@ -2606,7 +2733,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum2_field = 0x0000002a; + MemberId member_id_array_enum2_field = 0x0000002c; bool common_array_enum2_field_ec {false}; CommonStructMember common_array_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum2_field, member_flags_array_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum2_field, common_array_enum2_field_ec))}; if (!common_array_enum2_field_ec) @@ -2668,7 +2795,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_struct_field = 0x0000002b; + MemberId member_id_array_struct_field = 0x0000002d; bool common_array_struct_field_ec {false}; CommonStructMember common_array_struct_field {TypeObjectUtils::build_common_struct_member(member_id_array_struct_field, member_flags_array_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_struct_field, common_array_struct_field_ec))}; if (!common_array_struct_field_ec) @@ -2730,7 +2857,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_char_field = 0x0000002c; + MemberId member_id_bounded_sequence_char_field = 0x0000002e; bool common_bounded_sequence_char_field_ec {false}; CommonStructMember common_bounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_char_field, member_flags_bounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_char_field, common_bounded_sequence_char_field_ec))}; if (!common_bounded_sequence_char_field_ec) @@ -2792,7 +2919,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint8_field = 0x0000002d; + MemberId member_id_bounded_sequence_uint8_field = 0x0000002f; bool common_bounded_sequence_uint8_field_ec {false}; CommonStructMember common_bounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint8_field, member_flags_bounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint8_field, common_bounded_sequence_uint8_field_ec))}; if (!common_bounded_sequence_uint8_field_ec) @@ -2854,7 +2981,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int16_field = 0x0000002e; + MemberId member_id_bounded_sequence_int16_field = 0x00000030; bool common_bounded_sequence_int16_field_ec {false}; CommonStructMember common_bounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int16_field, member_flags_bounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int16_field, common_bounded_sequence_int16_field_ec))}; if (!common_bounded_sequence_int16_field_ec) @@ -2916,7 +3043,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint16_field = 0x0000002f; + MemberId member_id_bounded_sequence_uint16_field = 0x00000031; bool common_bounded_sequence_uint16_field_ec {false}; CommonStructMember common_bounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint16_field, member_flags_bounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint16_field, common_bounded_sequence_uint16_field_ec))}; if (!common_bounded_sequence_uint16_field_ec) @@ -2978,7 +3105,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int32_field = 0x00000030; + MemberId member_id_bounded_sequence_int32_field = 0x00000032; bool common_bounded_sequence_int32_field_ec {false}; CommonStructMember common_bounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int32_field, member_flags_bounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int32_field, common_bounded_sequence_int32_field_ec))}; if (!common_bounded_sequence_int32_field_ec) @@ -3040,7 +3167,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint32_field = 0x00000031; + MemberId member_id_bounded_sequence_uint32_field = 0x00000033; bool common_bounded_sequence_uint32_field_ec {false}; CommonStructMember common_bounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint32_field, member_flags_bounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint32_field, common_bounded_sequence_uint32_field_ec))}; if (!common_bounded_sequence_uint32_field_ec) @@ -3102,7 +3229,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int64_field = 0x00000032; + MemberId member_id_bounded_sequence_int64_field = 0x00000034; bool common_bounded_sequence_int64_field_ec {false}; CommonStructMember common_bounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int64_field, member_flags_bounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int64_field, common_bounded_sequence_int64_field_ec))}; if (!common_bounded_sequence_int64_field_ec) @@ -3164,7 +3291,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint64_field = 0x00000033; + MemberId member_id_bounded_sequence_uint64_field = 0x00000035; bool common_bounded_sequence_uint64_field_ec {false}; CommonStructMember common_bounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint64_field, member_flags_bounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint64_field, common_bounded_sequence_uint64_field_ec))}; if (!common_bounded_sequence_uint64_field_ec) @@ -3226,7 +3353,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_float_field = 0x00000034; + MemberId member_id_bounded_sequence_float_field = 0x00000036; bool common_bounded_sequence_float_field_ec {false}; CommonStructMember common_bounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_float_field, member_flags_bounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_float_field, common_bounded_sequence_float_field_ec))}; if (!common_bounded_sequence_float_field_ec) @@ -3288,7 +3415,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_double_field = 0x00000035; + MemberId member_id_bounded_sequence_double_field = 0x00000037; bool common_bounded_sequence_double_field_ec {false}; CommonStructMember common_bounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_double_field, member_flags_bounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_double_field, common_bounded_sequence_double_field_ec))}; if (!common_bounded_sequence_double_field_ec) @@ -3350,7 +3477,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_bool_field = 0x00000036; + MemberId member_id_bounded_sequence_bool_field = 0x00000038; bool common_bounded_sequence_bool_field_ec {false}; CommonStructMember common_bounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_bool_field, member_flags_bounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_bool_field, common_bounded_sequence_bool_field_ec))}; if (!common_bounded_sequence_bool_field_ec) @@ -3410,7 +3537,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum_field = 0x00000037; + MemberId member_id_bounded_sequence_enum_field = 0x00000039; bool common_bounded_sequence_enum_field_ec {false}; CommonStructMember common_bounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum_field, member_flags_bounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum_field, common_bounded_sequence_enum_field_ec))}; if (!common_bounded_sequence_enum_field_ec) @@ -3470,7 +3597,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum2_field = 0x00000038; + MemberId member_id_bounded_sequence_enum2_field = 0x0000003a; bool common_bounded_sequence_enum2_field_ec {false}; CommonStructMember common_bounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum2_field, member_flags_bounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum2_field, common_bounded_sequence_enum2_field_ec))}; if (!common_bounded_sequence_enum2_field_ec) @@ -3530,7 +3657,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_struct_field = 0x00000039; + MemberId member_id_bounded_sequence_struct_field = 0x0000003b; bool common_bounded_sequence_struct_field_ec {false}; CommonStructMember common_bounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_struct_field, member_flags_bounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_struct_field, common_bounded_sequence_struct_field_ec))}; if (!common_bounded_sequence_struct_field_ec) @@ -3592,7 +3719,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_char_field = 0x0000003a; + MemberId member_id_unbounded_sequence_char_field = 0x0000003c; bool common_unbounded_sequence_char_field_ec {false}; CommonStructMember common_unbounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_char_field, member_flags_unbounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_char_field, common_unbounded_sequence_char_field_ec))}; if (!common_unbounded_sequence_char_field_ec) @@ -3654,7 +3781,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint8_field = 0x0000003b; + MemberId member_id_unbounded_sequence_uint8_field = 0x0000003d; bool common_unbounded_sequence_uint8_field_ec {false}; CommonStructMember common_unbounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint8_field, member_flags_unbounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint8_field, common_unbounded_sequence_uint8_field_ec))}; if (!common_unbounded_sequence_uint8_field_ec) @@ -3716,7 +3843,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int16_field = 0x0000003c; + MemberId member_id_unbounded_sequence_int16_field = 0x0000003e; bool common_unbounded_sequence_int16_field_ec {false}; CommonStructMember common_unbounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int16_field, member_flags_unbounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int16_field, common_unbounded_sequence_int16_field_ec))}; if (!common_unbounded_sequence_int16_field_ec) @@ -3778,7 +3905,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint16_field = 0x0000003d; + MemberId member_id_unbounded_sequence_uint16_field = 0x0000003f; bool common_unbounded_sequence_uint16_field_ec {false}; CommonStructMember common_unbounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint16_field, member_flags_unbounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint16_field, common_unbounded_sequence_uint16_field_ec))}; if (!common_unbounded_sequence_uint16_field_ec) @@ -3840,7 +3967,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int32_field = 0x0000003e; + MemberId member_id_unbounded_sequence_int32_field = 0x00000040; bool common_unbounded_sequence_int32_field_ec {false}; CommonStructMember common_unbounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int32_field, member_flags_unbounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int32_field, common_unbounded_sequence_int32_field_ec))}; if (!common_unbounded_sequence_int32_field_ec) @@ -3902,7 +4029,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint32_field = 0x0000003f; + MemberId member_id_unbounded_sequence_uint32_field = 0x00000041; bool common_unbounded_sequence_uint32_field_ec {false}; CommonStructMember common_unbounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint32_field, member_flags_unbounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint32_field, common_unbounded_sequence_uint32_field_ec))}; if (!common_unbounded_sequence_uint32_field_ec) @@ -3964,7 +4091,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int64_field = 0x00000040; + MemberId member_id_unbounded_sequence_int64_field = 0x00000042; bool common_unbounded_sequence_int64_field_ec {false}; CommonStructMember common_unbounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int64_field, member_flags_unbounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int64_field, common_unbounded_sequence_int64_field_ec))}; if (!common_unbounded_sequence_int64_field_ec) @@ -4026,7 +4153,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint64_field = 0x00000041; + MemberId member_id_unbounded_sequence_uint64_field = 0x00000043; bool common_unbounded_sequence_uint64_field_ec {false}; CommonStructMember common_unbounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint64_field, member_flags_unbounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint64_field, common_unbounded_sequence_uint64_field_ec))}; if (!common_unbounded_sequence_uint64_field_ec) @@ -4088,7 +4215,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_float_field = 0x00000042; + MemberId member_id_unbounded_sequence_float_field = 0x00000044; bool common_unbounded_sequence_float_field_ec {false}; CommonStructMember common_unbounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_float_field, member_flags_unbounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_float_field, common_unbounded_sequence_float_field_ec))}; if (!common_unbounded_sequence_float_field_ec) @@ -4150,7 +4277,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_double_field = 0x00000043; + MemberId member_id_unbounded_sequence_double_field = 0x00000045; bool common_unbounded_sequence_double_field_ec {false}; CommonStructMember common_unbounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_double_field, member_flags_unbounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_double_field, common_unbounded_sequence_double_field_ec))}; if (!common_unbounded_sequence_double_field_ec) @@ -4212,7 +4339,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_bool_field = 0x00000044; + MemberId member_id_unbounded_sequence_bool_field = 0x00000046; bool common_unbounded_sequence_bool_field_ec {false}; CommonStructMember common_unbounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_bool_field, member_flags_unbounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_bool_field, common_unbounded_sequence_bool_field_ec))}; if (!common_unbounded_sequence_bool_field_ec) @@ -4272,7 +4399,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum_field = 0x00000045; + MemberId member_id_unbounded_sequence_enum_field = 0x00000047; bool common_unbounded_sequence_enum_field_ec {false}; CommonStructMember common_unbounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum_field, member_flags_unbounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum_field, common_unbounded_sequence_enum_field_ec))}; if (!common_unbounded_sequence_enum_field_ec) @@ -4332,7 +4459,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum2_field = 0x00000046; + MemberId member_id_unbounded_sequence_enum2_field = 0x00000048; bool common_unbounded_sequence_enum2_field_ec {false}; CommonStructMember common_unbounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum2_field, member_flags_unbounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum2_field, common_unbounded_sequence_enum2_field_ec))}; if (!common_unbounded_sequence_enum2_field_ec) @@ -4392,7 +4519,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_struct_field = 0x00000047; + MemberId member_id_unbounded_sequence_struct_field = 0x00000049; bool common_unbounded_sequence_struct_field_ec {false}; CommonStructMember common_unbounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_struct_field, member_flags_unbounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_struct_field, common_unbounded_sequence_struct_field_ec))}; if (!common_unbounded_sequence_struct_field_ec) @@ -4847,6 +4974,44 @@ void register_KeyedCompleteTestType_type_identifier( CompleteStructMember member_string_field = TypeObjectUtils::build_complete_struct_member(common_string_field, detail_string_field); TypeObjectUtils::add_complete_struct_member(member_seq_KeyedCompleteTestType, member_string_field); } + { + TypeIdentifierPair type_ids_fixed_string_field; + ReturnCode_t return_code_fixed_string_field {eprosima::fastdds::dds::RETCODE_OK}; + return_code_fixed_string_field = + eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( + "anonymous_string_16", type_ids_fixed_string_field); + + if (eprosima::fastdds::dds::RETCODE_OK != return_code_fixed_string_field) + { + { + SBound bound = static_cast(16); + StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound); + if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == + TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn, + "anonymous_string_16", type_ids_fixed_string_field)) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, + "anonymous_string_16 already registered in TypeObjectRegistry for a different type."); + } + } + } + StructMemberFlag member_flags_fixed_string_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, + false, false, false, false); + MemberId member_id_fixed_string_field = 0x0000000d; + bool common_fixed_string_field_ec {false}; + CommonStructMember common_fixed_string_field {TypeObjectUtils::build_common_struct_member(member_id_fixed_string_field, member_flags_fixed_string_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_fixed_string_field, common_fixed_string_field_ec))}; + if (!common_fixed_string_field_ec) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure fixed_string_field member TypeIdentifier inconsistent."); + return; + } + MemberName name_fixed_string_field = "fixed_string_field"; + eprosima::fastcdr::optional member_ann_builtin_fixed_string_field; + ann_custom_KeyedCompleteTestType.reset(); + CompleteMemberDetail detail_fixed_string_field = TypeObjectUtils::build_complete_member_detail(name_fixed_string_field, member_ann_builtin_fixed_string_field, ann_custom_KeyedCompleteTestType); + CompleteStructMember member_fixed_string_field = TypeObjectUtils::build_complete_struct_member(common_fixed_string_field, detail_fixed_string_field); + TypeObjectUtils::add_complete_struct_member(member_seq_KeyedCompleteTestType, member_fixed_string_field); + } { TypeIdentifierPair type_ids_enum_field; ReturnCode_t return_code_enum_field {eprosima::fastdds::dds::RETCODE_OK}; @@ -4860,7 +5025,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum_field = 0x0000000d; + MemberId member_id_enum_field = 0x0000000e; bool common_enum_field_ec {false}; CommonStructMember common_enum_field {TypeObjectUtils::build_common_struct_member(member_id_enum_field, member_flags_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_field, common_enum_field_ec))}; if (!common_enum_field_ec) @@ -4888,7 +5053,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum2_field = 0x0000000e; + MemberId member_id_enum2_field = 0x0000000f; bool common_enum2_field_ec {false}; CommonStructMember common_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_field, member_flags_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_field, common_enum2_field_ec))}; if (!common_enum2_field_ec) @@ -4916,7 +5081,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_struct_field = 0x0000000f; + MemberId member_id_struct_field = 0x00000010; bool common_struct_field_ec {false}; CommonStructMember common_struct_field {TypeObjectUtils::build_common_struct_member(member_id_struct_field, member_flags_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_struct_field, common_struct_field_ec))}; if (!common_struct_field_ec) @@ -4946,7 +5111,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_char_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_char_opt_field = 0x00000010; + MemberId member_id_char_opt_field = 0x00000011; bool common_char_opt_field_ec {false}; CommonStructMember common_char_opt_field {TypeObjectUtils::build_common_struct_member(member_id_char_opt_field, member_flags_char_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_char_opt_field, common_char_opt_field_ec))}; if (!common_char_opt_field_ec) @@ -4989,7 +5154,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_uint8_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint8_opt_field = 0x00000011; + MemberId member_id_uint8_opt_field = 0x00000012; bool common_uint8_opt_field_ec {false}; CommonStructMember common_uint8_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint8_opt_field, member_flags_uint8_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint8_opt_field, common_uint8_opt_field_ec))}; if (!common_uint8_opt_field_ec) @@ -5032,7 +5197,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_int16_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int16_opt_field = 0x00000012; + MemberId member_id_int16_opt_field = 0x00000013; bool common_int16_opt_field_ec {false}; CommonStructMember common_int16_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int16_opt_field, member_flags_int16_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int16_opt_field, common_int16_opt_field_ec))}; if (!common_int16_opt_field_ec) @@ -5075,7 +5240,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_uint16_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint16_opt_field = 0x00000013; + MemberId member_id_uint16_opt_field = 0x00000014; bool common_uint16_opt_field_ec {false}; CommonStructMember common_uint16_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint16_opt_field, member_flags_uint16_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint16_opt_field, common_uint16_opt_field_ec))}; if (!common_uint16_opt_field_ec) @@ -5118,7 +5283,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_int32_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int32_opt_field = 0x00000014; + MemberId member_id_int32_opt_field = 0x00000015; bool common_int32_opt_field_ec {false}; CommonStructMember common_int32_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int32_opt_field, member_flags_int32_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int32_opt_field, common_int32_opt_field_ec))}; if (!common_int32_opt_field_ec) @@ -5161,7 +5326,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_uint32_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint32_opt_field = 0x00000015; + MemberId member_id_uint32_opt_field = 0x00000016; bool common_uint32_opt_field_ec {false}; CommonStructMember common_uint32_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint32_opt_field, member_flags_uint32_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint32_opt_field, common_uint32_opt_field_ec))}; if (!common_uint32_opt_field_ec) @@ -5204,7 +5369,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_int64_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int64_opt_field = 0x00000016; + MemberId member_id_int64_opt_field = 0x00000017; bool common_int64_opt_field_ec {false}; CommonStructMember common_int64_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int64_opt_field, member_flags_int64_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int64_opt_field, common_int64_opt_field_ec))}; if (!common_int64_opt_field_ec) @@ -5247,7 +5412,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_uint64_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint64_opt_field = 0x00000017; + MemberId member_id_uint64_opt_field = 0x00000018; bool common_uint64_opt_field_ec {false}; CommonStructMember common_uint64_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint64_opt_field, member_flags_uint64_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint64_opt_field, common_uint64_opt_field_ec))}; if (!common_uint64_opt_field_ec) @@ -5290,7 +5455,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_float_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_float_opt_field = 0x00000018; + MemberId member_id_float_opt_field = 0x00000019; bool common_float_opt_field_ec {false}; CommonStructMember common_float_opt_field {TypeObjectUtils::build_common_struct_member(member_id_float_opt_field, member_flags_float_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_float_opt_field, common_float_opt_field_ec))}; if (!common_float_opt_field_ec) @@ -5333,7 +5498,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_double_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_double_opt_field = 0x00000019; + MemberId member_id_double_opt_field = 0x0000001a; bool common_double_opt_field_ec {false}; CommonStructMember common_double_opt_field {TypeObjectUtils::build_common_struct_member(member_id_double_opt_field, member_flags_double_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_double_opt_field, common_double_opt_field_ec))}; if (!common_double_opt_field_ec) @@ -5376,7 +5541,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bool_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_bool_opt_field = 0x0000001a; + MemberId member_id_bool_opt_field = 0x0000001b; bool common_bool_opt_field_ec {false}; CommonStructMember common_bool_opt_field {TypeObjectUtils::build_common_struct_member(member_id_bool_opt_field, member_flags_bool_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bool_opt_field, common_bool_opt_field_ec))}; if (!common_bool_opt_field_ec) @@ -5427,7 +5592,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_string_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_string_opt_field = 0x0000001b; + MemberId member_id_string_opt_field = 0x0000001c; bool common_string_opt_field_ec {false}; CommonStructMember common_string_opt_field {TypeObjectUtils::build_common_struct_member(member_id_string_opt_field, member_flags_string_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_string_opt_field, common_string_opt_field_ec))}; if (!common_string_opt_field_ec) @@ -5455,6 +5620,57 @@ void register_KeyedCompleteTestType_type_identifier( CompleteStructMember member_string_opt_field = TypeObjectUtils::build_complete_struct_member(common_string_opt_field, detail_string_opt_field); TypeObjectUtils::add_complete_struct_member(member_seq_KeyedCompleteTestType, member_string_opt_field); } + { + TypeIdentifierPair type_ids_fixed_string_opt_field; + ReturnCode_t return_code_fixed_string_opt_field {eprosima::fastdds::dds::RETCODE_OK}; + return_code_fixed_string_opt_field = + eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( + "anonymous_string_16", type_ids_fixed_string_opt_field); + + if (eprosima::fastdds::dds::RETCODE_OK != return_code_fixed_string_opt_field) + { + { + SBound bound = static_cast(16); + StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound); + if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == + TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn, + "anonymous_string_16", type_ids_fixed_string_opt_field)) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, + "anonymous_string_16 already registered in TypeObjectRegistry for a different type."); + } + } + } + StructMemberFlag member_flags_fixed_string_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, + true, false, false, false); + MemberId member_id_fixed_string_opt_field = 0x0000001d; + bool common_fixed_string_opt_field_ec {false}; + CommonStructMember common_fixed_string_opt_field {TypeObjectUtils::build_common_struct_member(member_id_fixed_string_opt_field, member_flags_fixed_string_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_fixed_string_opt_field, common_fixed_string_opt_field_ec))}; + if (!common_fixed_string_opt_field_ec) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure fixed_string_opt_field member TypeIdentifier inconsistent."); + return; + } + MemberName name_fixed_string_opt_field = "fixed_string_opt_field"; + eprosima::fastcdr::optional member_ann_builtin_fixed_string_opt_field; + ann_custom_KeyedCompleteTestType.reset(); + AppliedAnnotationSeq tmp_ann_custom_fixed_string_opt_field; + eprosima::fastcdr::optional unit_fixed_string_opt_field; + eprosima::fastcdr::optional min_fixed_string_opt_field; + eprosima::fastcdr::optional max_fixed_string_opt_field; + eprosima::fastcdr::optional hash_id_fixed_string_opt_field; + if (unit_fixed_string_opt_field.has_value() || min_fixed_string_opt_field.has_value() || max_fixed_string_opt_field.has_value() || hash_id_fixed_string_opt_field.has_value()) + { + member_ann_builtin_fixed_string_opt_field = TypeObjectUtils::build_applied_builtin_member_annotations(unit_fixed_string_opt_field, min_fixed_string_opt_field, max_fixed_string_opt_field, hash_id_fixed_string_opt_field); + } + if (!tmp_ann_custom_fixed_string_opt_field.empty()) + { + ann_custom_KeyedCompleteTestType = tmp_ann_custom_fixed_string_opt_field; + } + CompleteMemberDetail detail_fixed_string_opt_field = TypeObjectUtils::build_complete_member_detail(name_fixed_string_opt_field, member_ann_builtin_fixed_string_opt_field, ann_custom_KeyedCompleteTestType); + CompleteStructMember member_fixed_string_opt_field = TypeObjectUtils::build_complete_struct_member(common_fixed_string_opt_field, detail_fixed_string_opt_field); + TypeObjectUtils::add_complete_struct_member(member_seq_KeyedCompleteTestType, member_fixed_string_opt_field); + } { TypeIdentifierPair type_ids_enum_opt_field; ReturnCode_t return_code_enum_opt_field {eprosima::fastdds::dds::RETCODE_OK}; @@ -5468,7 +5684,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_enum_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum_opt_field = 0x0000001c; + MemberId member_id_enum_opt_field = 0x0000001e; bool common_enum_opt_field_ec {false}; CommonStructMember common_enum_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum_opt_field, member_flags_enum_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_opt_field, common_enum_opt_field_ec))}; if (!common_enum_opt_field_ec) @@ -5509,7 +5725,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_enum2_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum2_opt_field = 0x0000001d; + MemberId member_id_enum2_opt_field = 0x0000001f; bool common_enum2_opt_field_ec {false}; CommonStructMember common_enum2_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_opt_field, member_flags_enum2_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_opt_field, common_enum2_opt_field_ec))}; if (!common_enum2_opt_field_ec) @@ -5550,7 +5766,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_struct_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_struct_opt_field = 0x0000001e; + MemberId member_id_struct_opt_field = 0x00000020; bool common_struct_opt_field_ec {false}; CommonStructMember common_struct_opt_field {TypeObjectUtils::build_common_struct_member(member_id_struct_opt_field, member_flags_struct_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_struct_opt_field, common_struct_opt_field_ec))}; if (!common_struct_opt_field_ec) @@ -5627,7 +5843,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_char_field = 0x0000001f; + MemberId member_id_array_char_field = 0x00000021; bool common_array_char_field_ec {false}; CommonStructMember common_array_char_field {TypeObjectUtils::build_common_struct_member(member_id_array_char_field, member_flags_array_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_char_field, common_array_char_field_ec))}; if (!common_array_char_field_ec) @@ -5691,7 +5907,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint8_field = 0x00000020; + MemberId member_id_array_uint8_field = 0x00000022; bool common_array_uint8_field_ec {false}; CommonStructMember common_array_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint8_field, member_flags_array_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint8_field, common_array_uint8_field_ec))}; if (!common_array_uint8_field_ec) @@ -5755,7 +5971,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int16_field = 0x00000021; + MemberId member_id_array_int16_field = 0x00000023; bool common_array_int16_field_ec {false}; CommonStructMember common_array_int16_field {TypeObjectUtils::build_common_struct_member(member_id_array_int16_field, member_flags_array_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int16_field, common_array_int16_field_ec))}; if (!common_array_int16_field_ec) @@ -5819,7 +6035,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint16_field = 0x00000022; + MemberId member_id_array_uint16_field = 0x00000024; bool common_array_uint16_field_ec {false}; CommonStructMember common_array_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint16_field, member_flags_array_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint16_field, common_array_uint16_field_ec))}; if (!common_array_uint16_field_ec) @@ -5883,7 +6099,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int32_field = 0x00000023; + MemberId member_id_array_int32_field = 0x00000025; bool common_array_int32_field_ec {false}; CommonStructMember common_array_int32_field {TypeObjectUtils::build_common_struct_member(member_id_array_int32_field, member_flags_array_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int32_field, common_array_int32_field_ec))}; if (!common_array_int32_field_ec) @@ -5947,7 +6163,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint32_field = 0x00000024; + MemberId member_id_array_uint32_field = 0x00000026; bool common_array_uint32_field_ec {false}; CommonStructMember common_array_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint32_field, member_flags_array_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint32_field, common_array_uint32_field_ec))}; if (!common_array_uint32_field_ec) @@ -6011,7 +6227,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int64_field = 0x00000025; + MemberId member_id_array_int64_field = 0x00000027; bool common_array_int64_field_ec {false}; CommonStructMember common_array_int64_field {TypeObjectUtils::build_common_struct_member(member_id_array_int64_field, member_flags_array_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int64_field, common_array_int64_field_ec))}; if (!common_array_int64_field_ec) @@ -6075,7 +6291,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint64_field = 0x00000026; + MemberId member_id_array_uint64_field = 0x00000028; bool common_array_uint64_field_ec {false}; CommonStructMember common_array_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint64_field, member_flags_array_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint64_field, common_array_uint64_field_ec))}; if (!common_array_uint64_field_ec) @@ -6139,7 +6355,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_float_field = 0x00000027; + MemberId member_id_array_float_field = 0x00000029; bool common_array_float_field_ec {false}; CommonStructMember common_array_float_field {TypeObjectUtils::build_common_struct_member(member_id_array_float_field, member_flags_array_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_float_field, common_array_float_field_ec))}; if (!common_array_float_field_ec) @@ -6203,7 +6419,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_double_field = 0x00000028; + MemberId member_id_array_double_field = 0x0000002a; bool common_array_double_field_ec {false}; CommonStructMember common_array_double_field {TypeObjectUtils::build_common_struct_member(member_id_array_double_field, member_flags_array_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_double_field, common_array_double_field_ec))}; if (!common_array_double_field_ec) @@ -6267,7 +6483,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_bool_field = 0x00000029; + MemberId member_id_array_bool_field = 0x0000002b; bool common_array_bool_field_ec {false}; CommonStructMember common_array_bool_field {TypeObjectUtils::build_common_struct_member(member_id_array_bool_field, member_flags_array_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_bool_field, common_array_bool_field_ec))}; if (!common_array_bool_field_ec) @@ -6329,7 +6545,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum_field = 0x0000002a; + MemberId member_id_array_enum_field = 0x0000002c; bool common_array_enum_field_ec {false}; CommonStructMember common_array_enum_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum_field, member_flags_array_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum_field, common_array_enum_field_ec))}; if (!common_array_enum_field_ec) @@ -6391,7 +6607,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum2_field = 0x0000002b; + MemberId member_id_array_enum2_field = 0x0000002d; bool common_array_enum2_field_ec {false}; CommonStructMember common_array_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum2_field, member_flags_array_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum2_field, common_array_enum2_field_ec))}; if (!common_array_enum2_field_ec) @@ -6453,7 +6669,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_struct_field = 0x0000002c; + MemberId member_id_array_struct_field = 0x0000002e; bool common_array_struct_field_ec {false}; CommonStructMember common_array_struct_field {TypeObjectUtils::build_common_struct_member(member_id_array_struct_field, member_flags_array_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_struct_field, common_array_struct_field_ec))}; if (!common_array_struct_field_ec) @@ -6515,7 +6731,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_char_field = 0x0000002d; + MemberId member_id_bounded_sequence_char_field = 0x0000002f; bool common_bounded_sequence_char_field_ec {false}; CommonStructMember common_bounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_char_field, member_flags_bounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_char_field, common_bounded_sequence_char_field_ec))}; if (!common_bounded_sequence_char_field_ec) @@ -6577,7 +6793,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint8_field = 0x0000002e; + MemberId member_id_bounded_sequence_uint8_field = 0x00000030; bool common_bounded_sequence_uint8_field_ec {false}; CommonStructMember common_bounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint8_field, member_flags_bounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint8_field, common_bounded_sequence_uint8_field_ec))}; if (!common_bounded_sequence_uint8_field_ec) @@ -6639,7 +6855,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int16_field = 0x0000002f; + MemberId member_id_bounded_sequence_int16_field = 0x00000031; bool common_bounded_sequence_int16_field_ec {false}; CommonStructMember common_bounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int16_field, member_flags_bounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int16_field, common_bounded_sequence_int16_field_ec))}; if (!common_bounded_sequence_int16_field_ec) @@ -6701,7 +6917,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint16_field = 0x00000030; + MemberId member_id_bounded_sequence_uint16_field = 0x00000032; bool common_bounded_sequence_uint16_field_ec {false}; CommonStructMember common_bounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint16_field, member_flags_bounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint16_field, common_bounded_sequence_uint16_field_ec))}; if (!common_bounded_sequence_uint16_field_ec) @@ -6763,7 +6979,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int32_field = 0x00000031; + MemberId member_id_bounded_sequence_int32_field = 0x00000033; bool common_bounded_sequence_int32_field_ec {false}; CommonStructMember common_bounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int32_field, member_flags_bounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int32_field, common_bounded_sequence_int32_field_ec))}; if (!common_bounded_sequence_int32_field_ec) @@ -6825,7 +7041,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint32_field = 0x00000032; + MemberId member_id_bounded_sequence_uint32_field = 0x00000034; bool common_bounded_sequence_uint32_field_ec {false}; CommonStructMember common_bounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint32_field, member_flags_bounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint32_field, common_bounded_sequence_uint32_field_ec))}; if (!common_bounded_sequence_uint32_field_ec) @@ -6887,7 +7103,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int64_field = 0x00000033; + MemberId member_id_bounded_sequence_int64_field = 0x00000035; bool common_bounded_sequence_int64_field_ec {false}; CommonStructMember common_bounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int64_field, member_flags_bounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int64_field, common_bounded_sequence_int64_field_ec))}; if (!common_bounded_sequence_int64_field_ec) @@ -6949,7 +7165,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint64_field = 0x00000034; + MemberId member_id_bounded_sequence_uint64_field = 0x00000036; bool common_bounded_sequence_uint64_field_ec {false}; CommonStructMember common_bounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint64_field, member_flags_bounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint64_field, common_bounded_sequence_uint64_field_ec))}; if (!common_bounded_sequence_uint64_field_ec) @@ -7011,7 +7227,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_float_field = 0x00000035; + MemberId member_id_bounded_sequence_float_field = 0x00000037; bool common_bounded_sequence_float_field_ec {false}; CommonStructMember common_bounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_float_field, member_flags_bounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_float_field, common_bounded_sequence_float_field_ec))}; if (!common_bounded_sequence_float_field_ec) @@ -7073,7 +7289,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_double_field = 0x00000036; + MemberId member_id_bounded_sequence_double_field = 0x00000038; bool common_bounded_sequence_double_field_ec {false}; CommonStructMember common_bounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_double_field, member_flags_bounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_double_field, common_bounded_sequence_double_field_ec))}; if (!common_bounded_sequence_double_field_ec) @@ -7135,7 +7351,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_bool_field = 0x00000037; + MemberId member_id_bounded_sequence_bool_field = 0x00000039; bool common_bounded_sequence_bool_field_ec {false}; CommonStructMember common_bounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_bool_field, member_flags_bounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_bool_field, common_bounded_sequence_bool_field_ec))}; if (!common_bounded_sequence_bool_field_ec) @@ -7195,7 +7411,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum_field = 0x00000038; + MemberId member_id_bounded_sequence_enum_field = 0x0000003a; bool common_bounded_sequence_enum_field_ec {false}; CommonStructMember common_bounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum_field, member_flags_bounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum_field, common_bounded_sequence_enum_field_ec))}; if (!common_bounded_sequence_enum_field_ec) @@ -7255,7 +7471,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum2_field = 0x00000039; + MemberId member_id_bounded_sequence_enum2_field = 0x0000003b; bool common_bounded_sequence_enum2_field_ec {false}; CommonStructMember common_bounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum2_field, member_flags_bounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum2_field, common_bounded_sequence_enum2_field_ec))}; if (!common_bounded_sequence_enum2_field_ec) @@ -7315,7 +7531,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_struct_field = 0x0000003a; + MemberId member_id_bounded_sequence_struct_field = 0x0000003c; bool common_bounded_sequence_struct_field_ec {false}; CommonStructMember common_bounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_struct_field, member_flags_bounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_struct_field, common_bounded_sequence_struct_field_ec))}; if (!common_bounded_sequence_struct_field_ec) @@ -7377,7 +7593,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_char_field = 0x0000003b; + MemberId member_id_unbounded_sequence_char_field = 0x0000003d; bool common_unbounded_sequence_char_field_ec {false}; CommonStructMember common_unbounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_char_field, member_flags_unbounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_char_field, common_unbounded_sequence_char_field_ec))}; if (!common_unbounded_sequence_char_field_ec) @@ -7439,7 +7655,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint8_field = 0x0000003c; + MemberId member_id_unbounded_sequence_uint8_field = 0x0000003e; bool common_unbounded_sequence_uint8_field_ec {false}; CommonStructMember common_unbounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint8_field, member_flags_unbounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint8_field, common_unbounded_sequence_uint8_field_ec))}; if (!common_unbounded_sequence_uint8_field_ec) @@ -7501,7 +7717,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int16_field = 0x0000003d; + MemberId member_id_unbounded_sequence_int16_field = 0x0000003f; bool common_unbounded_sequence_int16_field_ec {false}; CommonStructMember common_unbounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int16_field, member_flags_unbounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int16_field, common_unbounded_sequence_int16_field_ec))}; if (!common_unbounded_sequence_int16_field_ec) @@ -7563,7 +7779,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint16_field = 0x0000003e; + MemberId member_id_unbounded_sequence_uint16_field = 0x00000040; bool common_unbounded_sequence_uint16_field_ec {false}; CommonStructMember common_unbounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint16_field, member_flags_unbounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint16_field, common_unbounded_sequence_uint16_field_ec))}; if (!common_unbounded_sequence_uint16_field_ec) @@ -7625,7 +7841,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int32_field = 0x0000003f; + MemberId member_id_unbounded_sequence_int32_field = 0x00000041; bool common_unbounded_sequence_int32_field_ec {false}; CommonStructMember common_unbounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int32_field, member_flags_unbounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int32_field, common_unbounded_sequence_int32_field_ec))}; if (!common_unbounded_sequence_int32_field_ec) @@ -7687,7 +7903,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint32_field = 0x00000040; + MemberId member_id_unbounded_sequence_uint32_field = 0x00000042; bool common_unbounded_sequence_uint32_field_ec {false}; CommonStructMember common_unbounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint32_field, member_flags_unbounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint32_field, common_unbounded_sequence_uint32_field_ec))}; if (!common_unbounded_sequence_uint32_field_ec) @@ -7749,7 +7965,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int64_field = 0x00000041; + MemberId member_id_unbounded_sequence_int64_field = 0x00000043; bool common_unbounded_sequence_int64_field_ec {false}; CommonStructMember common_unbounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int64_field, member_flags_unbounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int64_field, common_unbounded_sequence_int64_field_ec))}; if (!common_unbounded_sequence_int64_field_ec) @@ -7811,7 +8027,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint64_field = 0x00000042; + MemberId member_id_unbounded_sequence_uint64_field = 0x00000044; bool common_unbounded_sequence_uint64_field_ec {false}; CommonStructMember common_unbounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint64_field, member_flags_unbounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint64_field, common_unbounded_sequence_uint64_field_ec))}; if (!common_unbounded_sequence_uint64_field_ec) @@ -7873,7 +8089,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_float_field = 0x00000043; + MemberId member_id_unbounded_sequence_float_field = 0x00000045; bool common_unbounded_sequence_float_field_ec {false}; CommonStructMember common_unbounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_float_field, member_flags_unbounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_float_field, common_unbounded_sequence_float_field_ec))}; if (!common_unbounded_sequence_float_field_ec) @@ -7935,7 +8151,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_double_field = 0x00000044; + MemberId member_id_unbounded_sequence_double_field = 0x00000046; bool common_unbounded_sequence_double_field_ec {false}; CommonStructMember common_unbounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_double_field, member_flags_unbounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_double_field, common_unbounded_sequence_double_field_ec))}; if (!common_unbounded_sequence_double_field_ec) @@ -7997,7 +8213,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_bool_field = 0x00000045; + MemberId member_id_unbounded_sequence_bool_field = 0x00000047; bool common_unbounded_sequence_bool_field_ec {false}; CommonStructMember common_unbounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_bool_field, member_flags_unbounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_bool_field, common_unbounded_sequence_bool_field_ec))}; if (!common_unbounded_sequence_bool_field_ec) @@ -8057,7 +8273,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum_field = 0x00000046; + MemberId member_id_unbounded_sequence_enum_field = 0x00000048; bool common_unbounded_sequence_enum_field_ec {false}; CommonStructMember common_unbounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum_field, member_flags_unbounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum_field, common_unbounded_sequence_enum_field_ec))}; if (!common_unbounded_sequence_enum_field_ec) @@ -8117,7 +8333,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum2_field = 0x00000047; + MemberId member_id_unbounded_sequence_enum2_field = 0x00000049; bool common_unbounded_sequence_enum2_field_ec {false}; CommonStructMember common_unbounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum2_field, member_flags_unbounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum2_field, common_unbounded_sequence_enum2_field_ec))}; if (!common_unbounded_sequence_enum2_field_ec) @@ -8177,7 +8393,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_struct_field = 0x00000048; + MemberId member_id_unbounded_sequence_struct_field = 0x0000004a; bool common_unbounded_sequence_struct_field_ec {false}; CommonStructMember common_unbounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_struct_field, member_flags_unbounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_struct_field, common_unbounded_sequence_struct_field_ec))}; if (!common_unbounded_sequence_struct_field_ec) diff --git a/fastdds_python/test/types/test_modules.i b/fastdds_python/test/types/test_modules.i index 305a430b..1f75ce47 100644 --- a/fastdds_python/test/types/test_modules.i +++ b/fastdds_python/test/types/test_modules.i @@ -252,8 +252,6 @@ namespace swig { } } - - //////////////////////////////////////////////////////// // Binding for class eprosima::test::CompleteTestType //////////////////////////////////////////////////////// From 2e9875c6c8d00e001cedd3dbb1c3aab983504111 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Fri, 21 Feb 2025 13:28:00 +0100 Subject: [PATCH 04/10] Refs #22835. Remove optional fixed string. Signed-off-by: Miguel Company --- fastdds_python/test/api/test_datareader.py | 3 - fastdds_python/test/types/test_complete.hpp | 94 --- fastdds_python/test/types/test_complete.i | 44 -- fastdds_python/test/types/test_complete.idl | 4 +- .../test/types/test_completeCdrAux.hpp | 4 +- .../test/types/test_completeCdrAux.ipp | 556 +++++++++--------- .../types/test_completeTypeObjectSupport.cxx | 282 +++------ 7 files changed, 360 insertions(+), 627 deletions(-) diff --git a/fastdds_python/test/api/test_datareader.py b/fastdds_python/test/api/test_datareader.py index 60bd0b8c..9b8ef56e 100644 --- a/fastdds_python/test/api/test_datareader.py +++ b/fastdds_python/test/api/test_datareader.py @@ -195,7 +195,6 @@ def fill_keyed_complete_test_type(data): data.double_opt_field().set_value(1202.5) data.bool_opt_field().set_value(True) data.string_opt_field().set_value("Test string") - data.fixed_string_opt_field().set_value("Fixed string") data.enum_opt_field().set_value(pytest.dds_type.Color_MAGENTA) struct_field = pytest.dds_type.StructType() struct_field.char_field('\x01') @@ -319,8 +318,6 @@ def check_keyed_complete_test_type(data): assert(data.bool_opt_field().get_value() == True) assert(data.string_opt_field().has_value()) assert(data.string_opt_field().get_value() == "Test string") - assert(data.fixed_string_opt_field().has_value()) - assert(data.fixed_string_opt_field().get_value() == "Fixed string") assert(data.enum_opt_field().has_value()) assert(data.enum_opt_field().get_value() == pytest.dds_type.Color_MAGENTA) assert(not data.enum2_opt_field().has_value()) diff --git a/fastdds_python/test/types/test_complete.hpp b/fastdds_python/test/types/test_complete.hpp index f1a8ce0c..d77aab63 100644 --- a/fastdds_python/test/types/test_complete.hpp +++ b/fastdds_python/test/types/test_complete.hpp @@ -875,8 +875,6 @@ class CompleteTestType m_string_opt_field = x.m_string_opt_field; - m_fixed_string_opt_field = x.m_fixed_string_opt_field; - m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; @@ -1004,7 +1002,6 @@ class CompleteTestType m_double_opt_field = x.m_double_opt_field; m_bool_opt_field = x.m_bool_opt_field; m_string_opt_field = std::move(x.m_string_opt_field); - m_fixed_string_opt_field = std::move(x.m_fixed_string_opt_field); m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; m_struct_opt_field = std::move(x.m_struct_opt_field); @@ -1116,8 +1113,6 @@ class CompleteTestType m_string_opt_field = x.m_string_opt_field; - m_fixed_string_opt_field = x.m_fixed_string_opt_field; - m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; @@ -1247,7 +1242,6 @@ class CompleteTestType m_double_opt_field = x.m_double_opt_field; m_bool_opt_field = x.m_bool_opt_field; m_string_opt_field = std::move(x.m_string_opt_field); - m_fixed_string_opt_field = std::move(x.m_fixed_string_opt_field); m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; m_struct_opt_field = std::move(x.m_struct_opt_field); @@ -1331,7 +1325,6 @@ class CompleteTestType m_double_opt_field == x.m_double_opt_field && m_bool_opt_field == x.m_bool_opt_field && m_string_opt_field == x.m_string_opt_field && - m_fixed_string_opt_field == x.m_fixed_string_opt_field && m_enum_opt_field == x.m_enum_opt_field && m_enum2_opt_field == x.m_enum2_opt_field && m_struct_opt_field == x.m_struct_opt_field && @@ -2351,45 +2344,6 @@ class CompleteTestType } - /*! - * @brief This function copies the value in member fixed_string_opt_field - * @param _fixed_string_opt_field New value to be copied in member fixed_string_opt_field - */ - eProsima_user_DllExport void fixed_string_opt_field( - const eprosima::fastcdr::optional>& _fixed_string_opt_field) - { - m_fixed_string_opt_field = _fixed_string_opt_field; - } - - /*! - * @brief This function moves the value in member fixed_string_opt_field - * @param _fixed_string_opt_field New value to be moved in member fixed_string_opt_field - */ - eProsima_user_DllExport void fixed_string_opt_field( - eprosima::fastcdr::optional>&& _fixed_string_opt_field) - { - m_fixed_string_opt_field = std::move(_fixed_string_opt_field); - } - - /*! - * @brief This function returns a constant reference to member fixed_string_opt_field - * @return Constant reference to member fixed_string_opt_field - */ - eProsima_user_DllExport const eprosima::fastcdr::optional>& fixed_string_opt_field() const - { - return m_fixed_string_opt_field; - } - - /*! - * @brief This function returns a reference to member fixed_string_opt_field - * @return Reference to member fixed_string_opt_field - */ - eProsima_user_DllExport eprosima::fastcdr::optional>& fixed_string_opt_field() - { - return m_fixed_string_opt_field; - } - - /*! * @brief This function copies the value in member enum_opt_field * @param _enum_opt_field New value to be copied in member enum_opt_field @@ -4176,7 +4130,6 @@ class CompleteTestType eprosima::fastcdr::optional m_double_opt_field; eprosima::fastcdr::optional m_bool_opt_field; eprosima::fastcdr::optional m_string_opt_field; - eprosima::fastcdr::optional> m_fixed_string_opt_field; eprosima::fastcdr::optional m_enum_opt_field; eprosima::fastcdr::optional m_enum2_opt_field; eprosima::fastcdr::optional m_struct_opt_field; @@ -4311,8 +4264,6 @@ class KeyedCompleteTestType m_string_opt_field = x.m_string_opt_field; - m_fixed_string_opt_field = x.m_fixed_string_opt_field; - m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; @@ -4441,7 +4392,6 @@ class KeyedCompleteTestType m_double_opt_field = x.m_double_opt_field; m_bool_opt_field = x.m_bool_opt_field; m_string_opt_field = std::move(x.m_string_opt_field); - m_fixed_string_opt_field = std::move(x.m_fixed_string_opt_field); m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; m_struct_opt_field = std::move(x.m_struct_opt_field); @@ -4555,8 +4505,6 @@ class KeyedCompleteTestType m_string_opt_field = x.m_string_opt_field; - m_fixed_string_opt_field = x.m_fixed_string_opt_field; - m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; @@ -4687,7 +4635,6 @@ class KeyedCompleteTestType m_double_opt_field = x.m_double_opt_field; m_bool_opt_field = x.m_bool_opt_field; m_string_opt_field = std::move(x.m_string_opt_field); - m_fixed_string_opt_field = std::move(x.m_fixed_string_opt_field); m_enum_opt_field = x.m_enum_opt_field; m_enum2_opt_field = x.m_enum2_opt_field; m_struct_opt_field = std::move(x.m_struct_opt_field); @@ -4772,7 +4719,6 @@ class KeyedCompleteTestType m_double_opt_field == x.m_double_opt_field && m_bool_opt_field == x.m_bool_opt_field && m_string_opt_field == x.m_string_opt_field && - m_fixed_string_opt_field == x.m_fixed_string_opt_field && m_enum_opt_field == x.m_enum_opt_field && m_enum2_opt_field == x.m_enum2_opt_field && m_struct_opt_field == x.m_struct_opt_field && @@ -5821,45 +5767,6 @@ class KeyedCompleteTestType } - /*! - * @brief This function copies the value in member fixed_string_opt_field - * @param _fixed_string_opt_field New value to be copied in member fixed_string_opt_field - */ - eProsima_user_DllExport void fixed_string_opt_field( - const eprosima::fastcdr::optional>& _fixed_string_opt_field) - { - m_fixed_string_opt_field = _fixed_string_opt_field; - } - - /*! - * @brief This function moves the value in member fixed_string_opt_field - * @param _fixed_string_opt_field New value to be moved in member fixed_string_opt_field - */ - eProsima_user_DllExport void fixed_string_opt_field( - eprosima::fastcdr::optional>&& _fixed_string_opt_field) - { - m_fixed_string_opt_field = std::move(_fixed_string_opt_field); - } - - /*! - * @brief This function returns a constant reference to member fixed_string_opt_field - * @return Constant reference to member fixed_string_opt_field - */ - eProsima_user_DllExport const eprosima::fastcdr::optional>& fixed_string_opt_field() const - { - return m_fixed_string_opt_field; - } - - /*! - * @brief This function returns a reference to member fixed_string_opt_field - * @return Reference to member fixed_string_opt_field - */ - eProsima_user_DllExport eprosima::fastcdr::optional>& fixed_string_opt_field() - { - return m_fixed_string_opt_field; - } - - /*! * @brief This function copies the value in member enum_opt_field * @param _enum_opt_field New value to be copied in member enum_opt_field @@ -7647,7 +7554,6 @@ class KeyedCompleteTestType eprosima::fastcdr::optional m_double_opt_field; eprosima::fastcdr::optional m_bool_opt_field; eprosima::fastcdr::optional m_string_opt_field; - eprosima::fastcdr::optional> m_fixed_string_opt_field; eprosima::fastcdr::optional m_enum_opt_field; eprosima::fastcdr::optional m_enum2_opt_field; eprosima::fastcdr::optional m_struct_opt_field; diff --git a/fastdds_python/test/types/test_complete.i b/fastdds_python/test/types/test_complete.i index ace53e43..012096cc 100644 --- a/fastdds_python/test/types/test_complete.i +++ b/fastdds_python/test/types/test_complete.i @@ -725,28 +725,6 @@ namespace swig { -%ignore eprosima::fastcdr::optional::value; -%ignore eprosima::fastcdr::optional::reset; -%template(fixed_string<16>Opt) eprosima::fastcdr::optional>; -%extend eprosima::fastcdr::optional> { - eprosima::fastcdr::fixed_string<16> get_value() const { - return $self->value(); - } - - void set_value(const eprosima::fastcdr::fixed_string<16>& value) { - *$self = value; - } -} -%ignore CompleteTestType::fixed_string_opt_field(eprosima::fastcdr::optional>&&); - -// Overloaded getter methods shadow each other and are equivalent in python -// Const accesors produced constant enums instead of arrays/dictionaries when used -// We ignore them to prevent this -%ignore CompleteTestType::fixed_string_opt_field(); -%rename("%s") CompleteTestType::fixed_string_opt_field() const; - - - %ignore eprosima::fastcdr::optional::value; %ignore eprosima::fastcdr::optional::reset; %template(ColorOpt) eprosima::fastcdr::optional; @@ -1992,28 +1970,6 @@ namespace swig { -%ignore eprosima::fastcdr::optional::value; -%ignore eprosima::fastcdr::optional::reset; -%template(fixed_string<16>Opt) eprosima::fastcdr::optional>; -%extend eprosima::fastcdr::optional> { - eprosima::fastcdr::fixed_string<16> get_value() const { - return $self->value(); - } - - void set_value(const eprosima::fastcdr::fixed_string<16>& value) { - *$self = value; - } -} -%ignore KeyedCompleteTestType::fixed_string_opt_field(eprosima::fastcdr::optional>&&); - -// Overloaded getter methods shadow each other and are equivalent in python -// Const accesors produced constant enums instead of arrays/dictionaries when used -// We ignore them to prevent this -%ignore KeyedCompleteTestType::fixed_string_opt_field(); -%rename("%s") KeyedCompleteTestType::fixed_string_opt_field() const; - - - %ignore eprosima::fastcdr::optional::value; %ignore eprosima::fastcdr::optional::reset; %template(ColorOpt) eprosima::fastcdr::optional; diff --git a/fastdds_python/test/types/test_complete.idl b/fastdds_python/test/types/test_complete.idl index 8e42b3a3..ca2b14be 100644 --- a/fastdds_python/test/types/test_complete.idl +++ b/fastdds_python/test/types/test_complete.idl @@ -77,7 +77,7 @@ struct CompleteTestType //@optional long double long_double_opt_field; @optional boolean bool_opt_field; @optional string string_opt_field; - @optional string<16> fixed_string_opt_field; + //@optional string<16> fixed_string_opt_field; @optional Color enum_opt_field; @optional Material enum2_opt_field; @optional StructType struct_opt_field; @@ -175,7 +175,7 @@ struct KeyedCompleteTestType // @optional long double long_double_opt_field; @optional boolean bool_opt_field; @optional string string_opt_field; - @optional string<16> fixed_string_opt_field; + // @optional string<16> fixed_string_opt_field; @optional Color enum_opt_field; @optional Material enum2_opt_field; @optional StructType struct_opt_field; diff --git a/fastdds_python/test/types/test_completeCdrAux.hpp b/fastdds_python/test/types/test_completeCdrAux.hpp index 7797bd37..cbd6b49f 100644 --- a/fastdds_python/test/types/test_completeCdrAux.hpp +++ b/fastdds_python/test/types/test_completeCdrAux.hpp @@ -24,7 +24,7 @@ #include "test_complete.hpp" -constexpr uint32_t CompleteTestType_max_cdr_typesize {8204UL}; +constexpr uint32_t CompleteTestType_max_cdr_typesize {8164UL}; constexpr uint32_t CompleteTestType_max_key_cdr_typesize {0UL}; @@ -34,7 +34,7 @@ constexpr uint32_t StructType_max_key_cdr_typesize {0UL}; -constexpr uint32_t KeyedCompleteTestType_max_cdr_typesize {8204UL}; +constexpr uint32_t KeyedCompleteTestType_max_cdr_typesize {8164UL}; constexpr uint32_t KeyedCompleteTestType_max_key_cdr_typesize {4UL}; diff --git a/fastdds_python/test/types/test_completeCdrAux.ipp b/fastdds_python/test/types/test_completeCdrAux.ipp index 164e731b..9fd3ee42 100644 --- a/fastdds_python/test/types/test_completeCdrAux.ipp +++ b/fastdds_python/test/types/test_completeCdrAux.ipp @@ -368,141 +368,138 @@ eProsima_user_DllExport size_t calculate_serialized_size( data.string_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(28), - data.fixed_string_opt_field(), current_alignment); - - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(29), data.enum_opt_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(30), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(29), data.enum2_opt_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(31), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(30), data.struct_opt_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(32), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(31), data.array_char_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(33), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(32), data.array_uint8_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(34), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(33), data.array_int16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(35), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(34), data.array_uint16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(36), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(35), data.array_int32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(37), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(36), data.array_uint32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(38), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(37), data.array_int64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(39), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(38), data.array_uint64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(40), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(39), data.array_float_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(41), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(40), data.array_double_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(42), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(41), data.array_bool_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(43), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(42), data.array_enum_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(44), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(43), data.array_enum2_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(45), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(44), data.array_struct_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(46), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(45), data.bounded_sequence_char_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(47), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(46), data.bounded_sequence_uint8_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(48), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(47), data.bounded_sequence_int16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(49), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(48), data.bounded_sequence_uint16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(50), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(49), data.bounded_sequence_int32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(51), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(50), data.bounded_sequence_uint32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(52), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(51), data.bounded_sequence_int64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(53), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(52), data.bounded_sequence_uint64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(54), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(53), data.bounded_sequence_float_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(55), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(54), data.bounded_sequence_double_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(56), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(55), data.bounded_sequence_bool_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(57), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(56), data.bounded_sequence_enum_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(58), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(57), data.bounded_sequence_enum2_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(59), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(58), data.bounded_sequence_struct_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(60), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(59), data.unbounded_sequence_char_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(61), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(60), data.unbounded_sequence_uint8_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(62), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(61), data.unbounded_sequence_int16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(63), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(62), data.unbounded_sequence_uint16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(64), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(63), data.unbounded_sequence_int32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(65), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(64), data.unbounded_sequence_uint32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(66), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(65), data.unbounded_sequence_int64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(67), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(66), data.unbounded_sequence_uint64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(68), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(67), data.unbounded_sequence_float_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(69), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(68), data.unbounded_sequence_double_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(70), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(69), data.unbounded_sequence_bool_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(71), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(70), data.unbounded_sequence_enum_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(72), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(71), data.unbounded_sequence_enum2_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(73), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(72), data.unbounded_sequence_struct_field(), current_alignment); @@ -551,52 +548,51 @@ eProsima_user_DllExport void serialize( << eprosima::fastcdr::MemberId(25) << data.double_opt_field() << eprosima::fastcdr::MemberId(26) << data.bool_opt_field() << eprosima::fastcdr::MemberId(27) << data.string_opt_field() - << eprosima::fastcdr::MemberId(28) << data.fixed_string_opt_field() - << eprosima::fastcdr::MemberId(29) << data.enum_opt_field() - << eprosima::fastcdr::MemberId(30) << data.enum2_opt_field() - << eprosima::fastcdr::MemberId(31) << data.struct_opt_field() - << eprosima::fastcdr::MemberId(32) << data.array_char_field() - << eprosima::fastcdr::MemberId(33) << data.array_uint8_field() - << eprosima::fastcdr::MemberId(34) << data.array_int16_field() - << eprosima::fastcdr::MemberId(35) << data.array_uint16_field() - << eprosima::fastcdr::MemberId(36) << data.array_int32_field() - << eprosima::fastcdr::MemberId(37) << data.array_uint32_field() - << eprosima::fastcdr::MemberId(38) << data.array_int64_field() - << eprosima::fastcdr::MemberId(39) << data.array_uint64_field() - << eprosima::fastcdr::MemberId(40) << data.array_float_field() - << eprosima::fastcdr::MemberId(41) << data.array_double_field() - << eprosima::fastcdr::MemberId(42) << data.array_bool_field() - << eprosima::fastcdr::MemberId(43) << data.array_enum_field() - << eprosima::fastcdr::MemberId(44) << data.array_enum2_field() - << eprosima::fastcdr::MemberId(45) << data.array_struct_field() - << eprosima::fastcdr::MemberId(46) << data.bounded_sequence_char_field() - << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_float_field() - << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_double_field() - << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(58) << data.bounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(59) << data.bounded_sequence_struct_field() - << eprosima::fastcdr::MemberId(60) << data.unbounded_sequence_char_field() - << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_float_field() - << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_double_field() - << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(72) << data.unbounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(73) << data.unbounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(28) << data.enum_opt_field() + << eprosima::fastcdr::MemberId(29) << data.enum2_opt_field() + << eprosima::fastcdr::MemberId(30) << data.struct_opt_field() + << eprosima::fastcdr::MemberId(31) << data.array_char_field() + << eprosima::fastcdr::MemberId(32) << data.array_uint8_field() + << eprosima::fastcdr::MemberId(33) << data.array_int16_field() + << eprosima::fastcdr::MemberId(34) << data.array_uint16_field() + << eprosima::fastcdr::MemberId(35) << data.array_int32_field() + << eprosima::fastcdr::MemberId(36) << data.array_uint32_field() + << eprosima::fastcdr::MemberId(37) << data.array_int64_field() + << eprosima::fastcdr::MemberId(38) << data.array_uint64_field() + << eprosima::fastcdr::MemberId(39) << data.array_float_field() + << eprosima::fastcdr::MemberId(40) << data.array_double_field() + << eprosima::fastcdr::MemberId(41) << data.array_bool_field() + << eprosima::fastcdr::MemberId(42) << data.array_enum_field() + << eprosima::fastcdr::MemberId(43) << data.array_enum2_field() + << eprosima::fastcdr::MemberId(44) << data.array_struct_field() + << eprosima::fastcdr::MemberId(45) << data.bounded_sequence_char_field() + << eprosima::fastcdr::MemberId(46) << data.bounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_float_field() + << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_double_field() + << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(58) << data.bounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(59) << data.unbounded_sequence_char_field() + << eprosima::fastcdr::MemberId(60) << data.unbounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_float_field() + << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_double_field() + << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(72) << data.unbounded_sequence_struct_field() ; scdr.end_serialize_type(current_state); } @@ -727,186 +723,182 @@ eProsima_user_DllExport void deserialize( break; case 28: - dcdr >> data.fixed_string_opt_field(); - break; - - case 29: dcdr >> data.enum_opt_field(); break; - case 30: + case 29: dcdr >> data.enum2_opt_field(); break; - case 31: + case 30: dcdr >> data.struct_opt_field(); break; - case 32: + case 31: dcdr >> data.array_char_field(); break; - case 33: + case 32: dcdr >> data.array_uint8_field(); break; - case 34: + case 33: dcdr >> data.array_int16_field(); break; - case 35: + case 34: dcdr >> data.array_uint16_field(); break; - case 36: + case 35: dcdr >> data.array_int32_field(); break; - case 37: + case 36: dcdr >> data.array_uint32_field(); break; - case 38: + case 37: dcdr >> data.array_int64_field(); break; - case 39: + case 38: dcdr >> data.array_uint64_field(); break; - case 40: + case 39: dcdr >> data.array_float_field(); break; - case 41: + case 40: dcdr >> data.array_double_field(); break; - case 42: + case 41: dcdr >> data.array_bool_field(); break; - case 43: + case 42: dcdr >> data.array_enum_field(); break; - case 44: + case 43: dcdr >> data.array_enum2_field(); break; - case 45: + case 44: dcdr >> data.array_struct_field(); break; - case 46: + case 45: dcdr >> data.bounded_sequence_char_field(); break; - case 47: + case 46: dcdr >> data.bounded_sequence_uint8_field(); break; - case 48: + case 47: dcdr >> data.bounded_sequence_int16_field(); break; - case 49: + case 48: dcdr >> data.bounded_sequence_uint16_field(); break; - case 50: + case 49: dcdr >> data.bounded_sequence_int32_field(); break; - case 51: + case 50: dcdr >> data.bounded_sequence_uint32_field(); break; - case 52: + case 51: dcdr >> data.bounded_sequence_int64_field(); break; - case 53: + case 52: dcdr >> data.bounded_sequence_uint64_field(); break; - case 54: + case 53: dcdr >> data.bounded_sequence_float_field(); break; - case 55: + case 54: dcdr >> data.bounded_sequence_double_field(); break; - case 56: + case 55: dcdr >> data.bounded_sequence_bool_field(); break; - case 57: + case 56: dcdr >> data.bounded_sequence_enum_field(); break; - case 58: + case 57: dcdr >> data.bounded_sequence_enum2_field(); break; - case 59: + case 58: dcdr >> data.bounded_sequence_struct_field(); break; - case 60: + case 59: dcdr >> data.unbounded_sequence_char_field(); break; - case 61: + case 60: dcdr >> data.unbounded_sequence_uint8_field(); break; - case 62: + case 61: dcdr >> data.unbounded_sequence_int16_field(); break; - case 63: + case 62: dcdr >> data.unbounded_sequence_uint16_field(); break; - case 64: + case 63: dcdr >> data.unbounded_sequence_int32_field(); break; - case 65: + case 64: dcdr >> data.unbounded_sequence_uint32_field(); break; - case 66: + case 65: dcdr >> data.unbounded_sequence_int64_field(); break; - case 67: + case 66: dcdr >> data.unbounded_sequence_uint64_field(); break; - case 68: + case 67: dcdr >> data.unbounded_sequence_float_field(); break; - case 69: + case 68: dcdr >> data.unbounded_sequence_double_field(); break; - case 70: + case 69: dcdr >> data.unbounded_sequence_bool_field(); break; - case 71: + case 70: dcdr >> data.unbounded_sequence_enum_field(); break; - case 72: + case 71: dcdr >> data.unbounded_sequence_enum2_field(); break; - case 73: + case 72: dcdr >> data.unbounded_sequence_struct_field(); break; @@ -940,7 +932,6 @@ void serialize_key( - extern void serialize_key( Cdr& scdr, const StructType& data); @@ -1082,11 +1073,6 @@ void serialize_key( scdr << data.string_opt_field().value(); } - if (data.fixed_string_opt_field().has_value()) - { - scdr << data.fixed_string_opt_field().value(); - } - if (data.enum_opt_field().has_value()) { scdr << data.enum_opt_field().value(); @@ -1293,141 +1279,138 @@ eProsima_user_DllExport size_t calculate_serialized_size( data.string_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(29), - data.fixed_string_opt_field(), current_alignment); - - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(30), data.enum_opt_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(31), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(30), data.enum2_opt_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(32), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(31), data.struct_opt_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(33), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(32), data.array_char_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(34), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(33), data.array_uint8_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(35), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(34), data.array_int16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(36), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(35), data.array_uint16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(37), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(36), data.array_int32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(38), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(37), data.array_uint32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(39), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(38), data.array_int64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(40), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(39), data.array_uint64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(41), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(40), data.array_float_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(42), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(41), data.array_double_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(43), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(42), data.array_bool_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(44), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(43), data.array_enum_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(45), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(44), data.array_enum2_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(46), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(45), data.array_struct_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(47), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(46), data.bounded_sequence_char_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(48), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(47), data.bounded_sequence_uint8_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(49), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(48), data.bounded_sequence_int16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(50), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(49), data.bounded_sequence_uint16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(51), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(50), data.bounded_sequence_int32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(52), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(51), data.bounded_sequence_uint32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(53), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(52), data.bounded_sequence_int64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(54), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(53), data.bounded_sequence_uint64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(55), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(54), data.bounded_sequence_float_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(56), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(55), data.bounded_sequence_double_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(57), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(56), data.bounded_sequence_bool_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(58), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(57), data.bounded_sequence_enum_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(59), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(58), data.bounded_sequence_enum2_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(60), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(59), data.bounded_sequence_struct_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(61), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(60), data.unbounded_sequence_char_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(62), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(61), data.unbounded_sequence_uint8_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(63), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(62), data.unbounded_sequence_int16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(64), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(63), data.unbounded_sequence_uint16_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(65), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(64), data.unbounded_sequence_int32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(66), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(65), data.unbounded_sequence_uint32_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(67), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(66), data.unbounded_sequence_int64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(68), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(67), data.unbounded_sequence_uint64_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(69), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(68), data.unbounded_sequence_float_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(70), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(69), data.unbounded_sequence_double_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(71), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(70), data.unbounded_sequence_bool_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(72), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(71), data.unbounded_sequence_enum_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(73), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(72), data.unbounded_sequence_enum2_field(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(74), + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(73), data.unbounded_sequence_struct_field(), current_alignment); @@ -1477,52 +1460,51 @@ eProsima_user_DllExport void serialize( << eprosima::fastcdr::MemberId(26) << data.double_opt_field() << eprosima::fastcdr::MemberId(27) << data.bool_opt_field() << eprosima::fastcdr::MemberId(28) << data.string_opt_field() - << eprosima::fastcdr::MemberId(29) << data.fixed_string_opt_field() - << eprosima::fastcdr::MemberId(30) << data.enum_opt_field() - << eprosima::fastcdr::MemberId(31) << data.enum2_opt_field() - << eprosima::fastcdr::MemberId(32) << data.struct_opt_field() - << eprosima::fastcdr::MemberId(33) << data.array_char_field() - << eprosima::fastcdr::MemberId(34) << data.array_uint8_field() - << eprosima::fastcdr::MemberId(35) << data.array_int16_field() - << eprosima::fastcdr::MemberId(36) << data.array_uint16_field() - << eprosima::fastcdr::MemberId(37) << data.array_int32_field() - << eprosima::fastcdr::MemberId(38) << data.array_uint32_field() - << eprosima::fastcdr::MemberId(39) << data.array_int64_field() - << eprosima::fastcdr::MemberId(40) << data.array_uint64_field() - << eprosima::fastcdr::MemberId(41) << data.array_float_field() - << eprosima::fastcdr::MemberId(42) << data.array_double_field() - << eprosima::fastcdr::MemberId(43) << data.array_bool_field() - << eprosima::fastcdr::MemberId(44) << data.array_enum_field() - << eprosima::fastcdr::MemberId(45) << data.array_enum2_field() - << eprosima::fastcdr::MemberId(46) << data.array_struct_field() - << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_char_field() - << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_float_field() - << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_double_field() - << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(58) << data.bounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(59) << data.bounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(60) << data.bounded_sequence_struct_field() - << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_char_field() - << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_float_field() - << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_double_field() - << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(72) << data.unbounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(73) << data.unbounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(74) << data.unbounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(29) << data.enum_opt_field() + << eprosima::fastcdr::MemberId(30) << data.enum2_opt_field() + << eprosima::fastcdr::MemberId(31) << data.struct_opt_field() + << eprosima::fastcdr::MemberId(32) << data.array_char_field() + << eprosima::fastcdr::MemberId(33) << data.array_uint8_field() + << eprosima::fastcdr::MemberId(34) << data.array_int16_field() + << eprosima::fastcdr::MemberId(35) << data.array_uint16_field() + << eprosima::fastcdr::MemberId(36) << data.array_int32_field() + << eprosima::fastcdr::MemberId(37) << data.array_uint32_field() + << eprosima::fastcdr::MemberId(38) << data.array_int64_field() + << eprosima::fastcdr::MemberId(39) << data.array_uint64_field() + << eprosima::fastcdr::MemberId(40) << data.array_float_field() + << eprosima::fastcdr::MemberId(41) << data.array_double_field() + << eprosima::fastcdr::MemberId(42) << data.array_bool_field() + << eprosima::fastcdr::MemberId(43) << data.array_enum_field() + << eprosima::fastcdr::MemberId(44) << data.array_enum2_field() + << eprosima::fastcdr::MemberId(45) << data.array_struct_field() + << eprosima::fastcdr::MemberId(46) << data.bounded_sequence_char_field() + << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_float_field() + << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_double_field() + << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(58) << data.bounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(59) << data.bounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(60) << data.unbounded_sequence_char_field() + << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_float_field() + << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_double_field() + << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(72) << data.unbounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(73) << data.unbounded_sequence_struct_field() ; scdr.end_serialize_type(current_state); } @@ -1657,186 +1639,182 @@ eProsima_user_DllExport void deserialize( break; case 29: - dcdr >> data.fixed_string_opt_field(); - break; - - case 30: dcdr >> data.enum_opt_field(); break; - case 31: + case 30: dcdr >> data.enum2_opt_field(); break; - case 32: + case 31: dcdr >> data.struct_opt_field(); break; - case 33: + case 32: dcdr >> data.array_char_field(); break; - case 34: + case 33: dcdr >> data.array_uint8_field(); break; - case 35: + case 34: dcdr >> data.array_int16_field(); break; - case 36: + case 35: dcdr >> data.array_uint16_field(); break; - case 37: + case 36: dcdr >> data.array_int32_field(); break; - case 38: + case 37: dcdr >> data.array_uint32_field(); break; - case 39: + case 38: dcdr >> data.array_int64_field(); break; - case 40: + case 39: dcdr >> data.array_uint64_field(); break; - case 41: + case 40: dcdr >> data.array_float_field(); break; - case 42: + case 41: dcdr >> data.array_double_field(); break; - case 43: + case 42: dcdr >> data.array_bool_field(); break; - case 44: + case 43: dcdr >> data.array_enum_field(); break; - case 45: + case 44: dcdr >> data.array_enum2_field(); break; - case 46: + case 45: dcdr >> data.array_struct_field(); break; - case 47: + case 46: dcdr >> data.bounded_sequence_char_field(); break; - case 48: + case 47: dcdr >> data.bounded_sequence_uint8_field(); break; - case 49: + case 48: dcdr >> data.bounded_sequence_int16_field(); break; - case 50: + case 49: dcdr >> data.bounded_sequence_uint16_field(); break; - case 51: + case 50: dcdr >> data.bounded_sequence_int32_field(); break; - case 52: + case 51: dcdr >> data.bounded_sequence_uint32_field(); break; - case 53: + case 52: dcdr >> data.bounded_sequence_int64_field(); break; - case 54: + case 53: dcdr >> data.bounded_sequence_uint64_field(); break; - case 55: + case 54: dcdr >> data.bounded_sequence_float_field(); break; - case 56: + case 55: dcdr >> data.bounded_sequence_double_field(); break; - case 57: + case 56: dcdr >> data.bounded_sequence_bool_field(); break; - case 58: + case 57: dcdr >> data.bounded_sequence_enum_field(); break; - case 59: + case 58: dcdr >> data.bounded_sequence_enum2_field(); break; - case 60: + case 59: dcdr >> data.bounded_sequence_struct_field(); break; - case 61: + case 60: dcdr >> data.unbounded_sequence_char_field(); break; - case 62: + case 61: dcdr >> data.unbounded_sequence_uint8_field(); break; - case 63: + case 62: dcdr >> data.unbounded_sequence_int16_field(); break; - case 64: + case 63: dcdr >> data.unbounded_sequence_uint16_field(); break; - case 65: + case 64: dcdr >> data.unbounded_sequence_int32_field(); break; - case 66: + case 65: dcdr >> data.unbounded_sequence_uint32_field(); break; - case 67: + case 66: dcdr >> data.unbounded_sequence_int64_field(); break; - case 68: + case 67: dcdr >> data.unbounded_sequence_uint64_field(); break; - case 69: + case 68: dcdr >> data.unbounded_sequence_float_field(); break; - case 70: + case 69: dcdr >> data.unbounded_sequence_double_field(); break; - case 71: + case 70: dcdr >> data.unbounded_sequence_bool_field(); break; - case 72: + case 71: dcdr >> data.unbounded_sequence_enum_field(); break; - case 73: + case 72: dcdr >> data.unbounded_sequence_enum2_field(); break; - case 74: + case 73: dcdr >> data.unbounded_sequence_struct_field(); break; @@ -1870,7 +1848,6 @@ void serialize_key( - extern void serialize_key( Cdr& scdr, const StructType& data); @@ -1993,7 +1970,6 @@ void serialize_key( - } diff --git a/fastdds_python/test/types/test_completeTypeObjectSupport.cxx b/fastdds_python/test/types/test_completeTypeObjectSupport.cxx index 44f5d661..06d7eb9e 100644 --- a/fastdds_python/test/types/test_completeTypeObjectSupport.cxx +++ b/fastdds_python/test/types/test_completeTypeObjectSupport.cxx @@ -1746,57 +1746,6 @@ void register_CompleteTestType_type_identifier( CompleteStructMember member_string_opt_field = TypeObjectUtils::build_complete_struct_member(common_string_opt_field, detail_string_opt_field); TypeObjectUtils::add_complete_struct_member(member_seq_CompleteTestType, member_string_opt_field); } - { - TypeIdentifierPair type_ids_fixed_string_opt_field; - ReturnCode_t return_code_fixed_string_opt_field {eprosima::fastdds::dds::RETCODE_OK}; - return_code_fixed_string_opt_field = - eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( - "anonymous_string_16", type_ids_fixed_string_opt_field); - - if (eprosima::fastdds::dds::RETCODE_OK != return_code_fixed_string_opt_field) - { - { - SBound bound = static_cast(16); - StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound); - if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == - TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn, - "anonymous_string_16", type_ids_fixed_string_opt_field)) - { - EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, - "anonymous_string_16 already registered in TypeObjectRegistry for a different type."); - } - } - } - StructMemberFlag member_flags_fixed_string_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, - true, false, false, false); - MemberId member_id_fixed_string_opt_field = 0x0000001c; - bool common_fixed_string_opt_field_ec {false}; - CommonStructMember common_fixed_string_opt_field {TypeObjectUtils::build_common_struct_member(member_id_fixed_string_opt_field, member_flags_fixed_string_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_fixed_string_opt_field, common_fixed_string_opt_field_ec))}; - if (!common_fixed_string_opt_field_ec) - { - EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure fixed_string_opt_field member TypeIdentifier inconsistent."); - return; - } - MemberName name_fixed_string_opt_field = "fixed_string_opt_field"; - eprosima::fastcdr::optional member_ann_builtin_fixed_string_opt_field; - ann_custom_CompleteTestType.reset(); - AppliedAnnotationSeq tmp_ann_custom_fixed_string_opt_field; - eprosima::fastcdr::optional unit_fixed_string_opt_field; - eprosima::fastcdr::optional min_fixed_string_opt_field; - eprosima::fastcdr::optional max_fixed_string_opt_field; - eprosima::fastcdr::optional hash_id_fixed_string_opt_field; - if (unit_fixed_string_opt_field.has_value() || min_fixed_string_opt_field.has_value() || max_fixed_string_opt_field.has_value() || hash_id_fixed_string_opt_field.has_value()) - { - member_ann_builtin_fixed_string_opt_field = TypeObjectUtils::build_applied_builtin_member_annotations(unit_fixed_string_opt_field, min_fixed_string_opt_field, max_fixed_string_opt_field, hash_id_fixed_string_opt_field); - } - if (!tmp_ann_custom_fixed_string_opt_field.empty()) - { - ann_custom_CompleteTestType = tmp_ann_custom_fixed_string_opt_field; - } - CompleteMemberDetail detail_fixed_string_opt_field = TypeObjectUtils::build_complete_member_detail(name_fixed_string_opt_field, member_ann_builtin_fixed_string_opt_field, ann_custom_CompleteTestType); - CompleteStructMember member_fixed_string_opt_field = TypeObjectUtils::build_complete_struct_member(common_fixed_string_opt_field, detail_fixed_string_opt_field); - TypeObjectUtils::add_complete_struct_member(member_seq_CompleteTestType, member_fixed_string_opt_field); - } { TypeIdentifierPair type_ids_enum_opt_field; ReturnCode_t return_code_enum_opt_field {eprosima::fastdds::dds::RETCODE_OK}; @@ -1810,7 +1759,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_enum_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum_opt_field = 0x0000001d; + MemberId member_id_enum_opt_field = 0x0000001c; bool common_enum_opt_field_ec {false}; CommonStructMember common_enum_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum_opt_field, member_flags_enum_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_opt_field, common_enum_opt_field_ec))}; if (!common_enum_opt_field_ec) @@ -1851,7 +1800,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_enum2_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum2_opt_field = 0x0000001e; + MemberId member_id_enum2_opt_field = 0x0000001d; bool common_enum2_opt_field_ec {false}; CommonStructMember common_enum2_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_opt_field, member_flags_enum2_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_opt_field, common_enum2_opt_field_ec))}; if (!common_enum2_opt_field_ec) @@ -1892,7 +1841,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_struct_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_struct_opt_field = 0x0000001f; + MemberId member_id_struct_opt_field = 0x0000001e; bool common_struct_opt_field_ec {false}; CommonStructMember common_struct_opt_field {TypeObjectUtils::build_common_struct_member(member_id_struct_opt_field, member_flags_struct_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_struct_opt_field, common_struct_opt_field_ec))}; if (!common_struct_opt_field_ec) @@ -1969,7 +1918,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_char_field = 0x00000020; + MemberId member_id_array_char_field = 0x0000001f; bool common_array_char_field_ec {false}; CommonStructMember common_array_char_field {TypeObjectUtils::build_common_struct_member(member_id_array_char_field, member_flags_array_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_char_field, common_array_char_field_ec))}; if (!common_array_char_field_ec) @@ -2033,7 +1982,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint8_field = 0x00000021; + MemberId member_id_array_uint8_field = 0x00000020; bool common_array_uint8_field_ec {false}; CommonStructMember common_array_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint8_field, member_flags_array_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint8_field, common_array_uint8_field_ec))}; if (!common_array_uint8_field_ec) @@ -2097,7 +2046,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int16_field = 0x00000022; + MemberId member_id_array_int16_field = 0x00000021; bool common_array_int16_field_ec {false}; CommonStructMember common_array_int16_field {TypeObjectUtils::build_common_struct_member(member_id_array_int16_field, member_flags_array_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int16_field, common_array_int16_field_ec))}; if (!common_array_int16_field_ec) @@ -2161,7 +2110,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint16_field = 0x00000023; + MemberId member_id_array_uint16_field = 0x00000022; bool common_array_uint16_field_ec {false}; CommonStructMember common_array_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint16_field, member_flags_array_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint16_field, common_array_uint16_field_ec))}; if (!common_array_uint16_field_ec) @@ -2225,7 +2174,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int32_field = 0x00000024; + MemberId member_id_array_int32_field = 0x00000023; bool common_array_int32_field_ec {false}; CommonStructMember common_array_int32_field {TypeObjectUtils::build_common_struct_member(member_id_array_int32_field, member_flags_array_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int32_field, common_array_int32_field_ec))}; if (!common_array_int32_field_ec) @@ -2289,7 +2238,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint32_field = 0x00000025; + MemberId member_id_array_uint32_field = 0x00000024; bool common_array_uint32_field_ec {false}; CommonStructMember common_array_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint32_field, member_flags_array_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint32_field, common_array_uint32_field_ec))}; if (!common_array_uint32_field_ec) @@ -2353,7 +2302,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int64_field = 0x00000026; + MemberId member_id_array_int64_field = 0x00000025; bool common_array_int64_field_ec {false}; CommonStructMember common_array_int64_field {TypeObjectUtils::build_common_struct_member(member_id_array_int64_field, member_flags_array_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int64_field, common_array_int64_field_ec))}; if (!common_array_int64_field_ec) @@ -2417,7 +2366,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint64_field = 0x00000027; + MemberId member_id_array_uint64_field = 0x00000026; bool common_array_uint64_field_ec {false}; CommonStructMember common_array_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint64_field, member_flags_array_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint64_field, common_array_uint64_field_ec))}; if (!common_array_uint64_field_ec) @@ -2481,7 +2430,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_float_field = 0x00000028; + MemberId member_id_array_float_field = 0x00000027; bool common_array_float_field_ec {false}; CommonStructMember common_array_float_field {TypeObjectUtils::build_common_struct_member(member_id_array_float_field, member_flags_array_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_float_field, common_array_float_field_ec))}; if (!common_array_float_field_ec) @@ -2545,7 +2494,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_double_field = 0x00000029; + MemberId member_id_array_double_field = 0x00000028; bool common_array_double_field_ec {false}; CommonStructMember common_array_double_field {TypeObjectUtils::build_common_struct_member(member_id_array_double_field, member_flags_array_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_double_field, common_array_double_field_ec))}; if (!common_array_double_field_ec) @@ -2609,7 +2558,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_bool_field = 0x0000002a; + MemberId member_id_array_bool_field = 0x00000029; bool common_array_bool_field_ec {false}; CommonStructMember common_array_bool_field {TypeObjectUtils::build_common_struct_member(member_id_array_bool_field, member_flags_array_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_bool_field, common_array_bool_field_ec))}; if (!common_array_bool_field_ec) @@ -2671,7 +2620,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum_field = 0x0000002b; + MemberId member_id_array_enum_field = 0x0000002a; bool common_array_enum_field_ec {false}; CommonStructMember common_array_enum_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum_field, member_flags_array_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum_field, common_array_enum_field_ec))}; if (!common_array_enum_field_ec) @@ -2733,7 +2682,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum2_field = 0x0000002c; + MemberId member_id_array_enum2_field = 0x0000002b; bool common_array_enum2_field_ec {false}; CommonStructMember common_array_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum2_field, member_flags_array_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum2_field, common_array_enum2_field_ec))}; if (!common_array_enum2_field_ec) @@ -2795,7 +2744,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_struct_field = 0x0000002d; + MemberId member_id_array_struct_field = 0x0000002c; bool common_array_struct_field_ec {false}; CommonStructMember common_array_struct_field {TypeObjectUtils::build_common_struct_member(member_id_array_struct_field, member_flags_array_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_struct_field, common_array_struct_field_ec))}; if (!common_array_struct_field_ec) @@ -2857,7 +2806,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_char_field = 0x0000002e; + MemberId member_id_bounded_sequence_char_field = 0x0000002d; bool common_bounded_sequence_char_field_ec {false}; CommonStructMember common_bounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_char_field, member_flags_bounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_char_field, common_bounded_sequence_char_field_ec))}; if (!common_bounded_sequence_char_field_ec) @@ -2919,7 +2868,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint8_field = 0x0000002f; + MemberId member_id_bounded_sequence_uint8_field = 0x0000002e; bool common_bounded_sequence_uint8_field_ec {false}; CommonStructMember common_bounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint8_field, member_flags_bounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint8_field, common_bounded_sequence_uint8_field_ec))}; if (!common_bounded_sequence_uint8_field_ec) @@ -2981,7 +2930,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int16_field = 0x00000030; + MemberId member_id_bounded_sequence_int16_field = 0x0000002f; bool common_bounded_sequence_int16_field_ec {false}; CommonStructMember common_bounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int16_field, member_flags_bounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int16_field, common_bounded_sequence_int16_field_ec))}; if (!common_bounded_sequence_int16_field_ec) @@ -3043,7 +2992,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint16_field = 0x00000031; + MemberId member_id_bounded_sequence_uint16_field = 0x00000030; bool common_bounded_sequence_uint16_field_ec {false}; CommonStructMember common_bounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint16_field, member_flags_bounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint16_field, common_bounded_sequence_uint16_field_ec))}; if (!common_bounded_sequence_uint16_field_ec) @@ -3105,7 +3054,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int32_field = 0x00000032; + MemberId member_id_bounded_sequence_int32_field = 0x00000031; bool common_bounded_sequence_int32_field_ec {false}; CommonStructMember common_bounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int32_field, member_flags_bounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int32_field, common_bounded_sequence_int32_field_ec))}; if (!common_bounded_sequence_int32_field_ec) @@ -3167,7 +3116,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint32_field = 0x00000033; + MemberId member_id_bounded_sequence_uint32_field = 0x00000032; bool common_bounded_sequence_uint32_field_ec {false}; CommonStructMember common_bounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint32_field, member_flags_bounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint32_field, common_bounded_sequence_uint32_field_ec))}; if (!common_bounded_sequence_uint32_field_ec) @@ -3229,7 +3178,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int64_field = 0x00000034; + MemberId member_id_bounded_sequence_int64_field = 0x00000033; bool common_bounded_sequence_int64_field_ec {false}; CommonStructMember common_bounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int64_field, member_flags_bounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int64_field, common_bounded_sequence_int64_field_ec))}; if (!common_bounded_sequence_int64_field_ec) @@ -3291,7 +3240,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint64_field = 0x00000035; + MemberId member_id_bounded_sequence_uint64_field = 0x00000034; bool common_bounded_sequence_uint64_field_ec {false}; CommonStructMember common_bounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint64_field, member_flags_bounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint64_field, common_bounded_sequence_uint64_field_ec))}; if (!common_bounded_sequence_uint64_field_ec) @@ -3353,7 +3302,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_float_field = 0x00000036; + MemberId member_id_bounded_sequence_float_field = 0x00000035; bool common_bounded_sequence_float_field_ec {false}; CommonStructMember common_bounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_float_field, member_flags_bounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_float_field, common_bounded_sequence_float_field_ec))}; if (!common_bounded_sequence_float_field_ec) @@ -3415,7 +3364,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_double_field = 0x00000037; + MemberId member_id_bounded_sequence_double_field = 0x00000036; bool common_bounded_sequence_double_field_ec {false}; CommonStructMember common_bounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_double_field, member_flags_bounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_double_field, common_bounded_sequence_double_field_ec))}; if (!common_bounded_sequence_double_field_ec) @@ -3477,7 +3426,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_bool_field = 0x00000038; + MemberId member_id_bounded_sequence_bool_field = 0x00000037; bool common_bounded_sequence_bool_field_ec {false}; CommonStructMember common_bounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_bool_field, member_flags_bounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_bool_field, common_bounded_sequence_bool_field_ec))}; if (!common_bounded_sequence_bool_field_ec) @@ -3537,7 +3486,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum_field = 0x00000039; + MemberId member_id_bounded_sequence_enum_field = 0x00000038; bool common_bounded_sequence_enum_field_ec {false}; CommonStructMember common_bounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum_field, member_flags_bounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum_field, common_bounded_sequence_enum_field_ec))}; if (!common_bounded_sequence_enum_field_ec) @@ -3597,7 +3546,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum2_field = 0x0000003a; + MemberId member_id_bounded_sequence_enum2_field = 0x00000039; bool common_bounded_sequence_enum2_field_ec {false}; CommonStructMember common_bounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum2_field, member_flags_bounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum2_field, common_bounded_sequence_enum2_field_ec))}; if (!common_bounded_sequence_enum2_field_ec) @@ -3657,7 +3606,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_struct_field = 0x0000003b; + MemberId member_id_bounded_sequence_struct_field = 0x0000003a; bool common_bounded_sequence_struct_field_ec {false}; CommonStructMember common_bounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_struct_field, member_flags_bounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_struct_field, common_bounded_sequence_struct_field_ec))}; if (!common_bounded_sequence_struct_field_ec) @@ -3719,7 +3668,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_char_field = 0x0000003c; + MemberId member_id_unbounded_sequence_char_field = 0x0000003b; bool common_unbounded_sequence_char_field_ec {false}; CommonStructMember common_unbounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_char_field, member_flags_unbounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_char_field, common_unbounded_sequence_char_field_ec))}; if (!common_unbounded_sequence_char_field_ec) @@ -3781,7 +3730,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint8_field = 0x0000003d; + MemberId member_id_unbounded_sequence_uint8_field = 0x0000003c; bool common_unbounded_sequence_uint8_field_ec {false}; CommonStructMember common_unbounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint8_field, member_flags_unbounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint8_field, common_unbounded_sequence_uint8_field_ec))}; if (!common_unbounded_sequence_uint8_field_ec) @@ -3843,7 +3792,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int16_field = 0x0000003e; + MemberId member_id_unbounded_sequence_int16_field = 0x0000003d; bool common_unbounded_sequence_int16_field_ec {false}; CommonStructMember common_unbounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int16_field, member_flags_unbounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int16_field, common_unbounded_sequence_int16_field_ec))}; if (!common_unbounded_sequence_int16_field_ec) @@ -3905,7 +3854,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint16_field = 0x0000003f; + MemberId member_id_unbounded_sequence_uint16_field = 0x0000003e; bool common_unbounded_sequence_uint16_field_ec {false}; CommonStructMember common_unbounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint16_field, member_flags_unbounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint16_field, common_unbounded_sequence_uint16_field_ec))}; if (!common_unbounded_sequence_uint16_field_ec) @@ -3967,7 +3916,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int32_field = 0x00000040; + MemberId member_id_unbounded_sequence_int32_field = 0x0000003f; bool common_unbounded_sequence_int32_field_ec {false}; CommonStructMember common_unbounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int32_field, member_flags_unbounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int32_field, common_unbounded_sequence_int32_field_ec))}; if (!common_unbounded_sequence_int32_field_ec) @@ -4029,7 +3978,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint32_field = 0x00000041; + MemberId member_id_unbounded_sequence_uint32_field = 0x00000040; bool common_unbounded_sequence_uint32_field_ec {false}; CommonStructMember common_unbounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint32_field, member_flags_unbounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint32_field, common_unbounded_sequence_uint32_field_ec))}; if (!common_unbounded_sequence_uint32_field_ec) @@ -4091,7 +4040,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int64_field = 0x00000042; + MemberId member_id_unbounded_sequence_int64_field = 0x00000041; bool common_unbounded_sequence_int64_field_ec {false}; CommonStructMember common_unbounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int64_field, member_flags_unbounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int64_field, common_unbounded_sequence_int64_field_ec))}; if (!common_unbounded_sequence_int64_field_ec) @@ -4153,7 +4102,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint64_field = 0x00000043; + MemberId member_id_unbounded_sequence_uint64_field = 0x00000042; bool common_unbounded_sequence_uint64_field_ec {false}; CommonStructMember common_unbounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint64_field, member_flags_unbounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint64_field, common_unbounded_sequence_uint64_field_ec))}; if (!common_unbounded_sequence_uint64_field_ec) @@ -4215,7 +4164,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_float_field = 0x00000044; + MemberId member_id_unbounded_sequence_float_field = 0x00000043; bool common_unbounded_sequence_float_field_ec {false}; CommonStructMember common_unbounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_float_field, member_flags_unbounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_float_field, common_unbounded_sequence_float_field_ec))}; if (!common_unbounded_sequence_float_field_ec) @@ -4277,7 +4226,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_double_field = 0x00000045; + MemberId member_id_unbounded_sequence_double_field = 0x00000044; bool common_unbounded_sequence_double_field_ec {false}; CommonStructMember common_unbounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_double_field, member_flags_unbounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_double_field, common_unbounded_sequence_double_field_ec))}; if (!common_unbounded_sequence_double_field_ec) @@ -4339,7 +4288,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_bool_field = 0x00000046; + MemberId member_id_unbounded_sequence_bool_field = 0x00000045; bool common_unbounded_sequence_bool_field_ec {false}; CommonStructMember common_unbounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_bool_field, member_flags_unbounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_bool_field, common_unbounded_sequence_bool_field_ec))}; if (!common_unbounded_sequence_bool_field_ec) @@ -4399,7 +4348,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum_field = 0x00000047; + MemberId member_id_unbounded_sequence_enum_field = 0x00000046; bool common_unbounded_sequence_enum_field_ec {false}; CommonStructMember common_unbounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum_field, member_flags_unbounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum_field, common_unbounded_sequence_enum_field_ec))}; if (!common_unbounded_sequence_enum_field_ec) @@ -4459,7 +4408,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum2_field = 0x00000048; + MemberId member_id_unbounded_sequence_enum2_field = 0x00000047; bool common_unbounded_sequence_enum2_field_ec {false}; CommonStructMember common_unbounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum2_field, member_flags_unbounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum2_field, common_unbounded_sequence_enum2_field_ec))}; if (!common_unbounded_sequence_enum2_field_ec) @@ -4519,7 +4468,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_struct_field = 0x00000049; + MemberId member_id_unbounded_sequence_struct_field = 0x00000048; bool common_unbounded_sequence_struct_field_ec {false}; CommonStructMember common_unbounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_struct_field, member_flags_unbounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_struct_field, common_unbounded_sequence_struct_field_ec))}; if (!common_unbounded_sequence_struct_field_ec) @@ -5620,57 +5569,6 @@ void register_KeyedCompleteTestType_type_identifier( CompleteStructMember member_string_opt_field = TypeObjectUtils::build_complete_struct_member(common_string_opt_field, detail_string_opt_field); TypeObjectUtils::add_complete_struct_member(member_seq_KeyedCompleteTestType, member_string_opt_field); } - { - TypeIdentifierPair type_ids_fixed_string_opt_field; - ReturnCode_t return_code_fixed_string_opt_field {eprosima::fastdds::dds::RETCODE_OK}; - return_code_fixed_string_opt_field = - eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( - "anonymous_string_16", type_ids_fixed_string_opt_field); - - if (eprosima::fastdds::dds::RETCODE_OK != return_code_fixed_string_opt_field) - { - { - SBound bound = static_cast(16); - StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound); - if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == - TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn, - "anonymous_string_16", type_ids_fixed_string_opt_field)) - { - EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, - "anonymous_string_16 already registered in TypeObjectRegistry for a different type."); - } - } - } - StructMemberFlag member_flags_fixed_string_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, - true, false, false, false); - MemberId member_id_fixed_string_opt_field = 0x0000001d; - bool common_fixed_string_opt_field_ec {false}; - CommonStructMember common_fixed_string_opt_field {TypeObjectUtils::build_common_struct_member(member_id_fixed_string_opt_field, member_flags_fixed_string_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_fixed_string_opt_field, common_fixed_string_opt_field_ec))}; - if (!common_fixed_string_opt_field_ec) - { - EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure fixed_string_opt_field member TypeIdentifier inconsistent."); - return; - } - MemberName name_fixed_string_opt_field = "fixed_string_opt_field"; - eprosima::fastcdr::optional member_ann_builtin_fixed_string_opt_field; - ann_custom_KeyedCompleteTestType.reset(); - AppliedAnnotationSeq tmp_ann_custom_fixed_string_opt_field; - eprosima::fastcdr::optional unit_fixed_string_opt_field; - eprosima::fastcdr::optional min_fixed_string_opt_field; - eprosima::fastcdr::optional max_fixed_string_opt_field; - eprosima::fastcdr::optional hash_id_fixed_string_opt_field; - if (unit_fixed_string_opt_field.has_value() || min_fixed_string_opt_field.has_value() || max_fixed_string_opt_field.has_value() || hash_id_fixed_string_opt_field.has_value()) - { - member_ann_builtin_fixed_string_opt_field = TypeObjectUtils::build_applied_builtin_member_annotations(unit_fixed_string_opt_field, min_fixed_string_opt_field, max_fixed_string_opt_field, hash_id_fixed_string_opt_field); - } - if (!tmp_ann_custom_fixed_string_opt_field.empty()) - { - ann_custom_KeyedCompleteTestType = tmp_ann_custom_fixed_string_opt_field; - } - CompleteMemberDetail detail_fixed_string_opt_field = TypeObjectUtils::build_complete_member_detail(name_fixed_string_opt_field, member_ann_builtin_fixed_string_opt_field, ann_custom_KeyedCompleteTestType); - CompleteStructMember member_fixed_string_opt_field = TypeObjectUtils::build_complete_struct_member(common_fixed_string_opt_field, detail_fixed_string_opt_field); - TypeObjectUtils::add_complete_struct_member(member_seq_KeyedCompleteTestType, member_fixed_string_opt_field); - } { TypeIdentifierPair type_ids_enum_opt_field; ReturnCode_t return_code_enum_opt_field {eprosima::fastdds::dds::RETCODE_OK}; @@ -5684,7 +5582,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_enum_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum_opt_field = 0x0000001e; + MemberId member_id_enum_opt_field = 0x0000001d; bool common_enum_opt_field_ec {false}; CommonStructMember common_enum_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum_opt_field, member_flags_enum_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_opt_field, common_enum_opt_field_ec))}; if (!common_enum_opt_field_ec) @@ -5725,7 +5623,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_enum2_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum2_opt_field = 0x0000001f; + MemberId member_id_enum2_opt_field = 0x0000001e; bool common_enum2_opt_field_ec {false}; CommonStructMember common_enum2_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_opt_field, member_flags_enum2_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_opt_field, common_enum2_opt_field_ec))}; if (!common_enum2_opt_field_ec) @@ -5766,7 +5664,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_struct_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_struct_opt_field = 0x00000020; + MemberId member_id_struct_opt_field = 0x0000001f; bool common_struct_opt_field_ec {false}; CommonStructMember common_struct_opt_field {TypeObjectUtils::build_common_struct_member(member_id_struct_opt_field, member_flags_struct_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_struct_opt_field, common_struct_opt_field_ec))}; if (!common_struct_opt_field_ec) @@ -5843,7 +5741,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_char_field = 0x00000021; + MemberId member_id_array_char_field = 0x00000020; bool common_array_char_field_ec {false}; CommonStructMember common_array_char_field {TypeObjectUtils::build_common_struct_member(member_id_array_char_field, member_flags_array_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_char_field, common_array_char_field_ec))}; if (!common_array_char_field_ec) @@ -5907,7 +5805,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint8_field = 0x00000022; + MemberId member_id_array_uint8_field = 0x00000021; bool common_array_uint8_field_ec {false}; CommonStructMember common_array_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint8_field, member_flags_array_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint8_field, common_array_uint8_field_ec))}; if (!common_array_uint8_field_ec) @@ -5971,7 +5869,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int16_field = 0x00000023; + MemberId member_id_array_int16_field = 0x00000022; bool common_array_int16_field_ec {false}; CommonStructMember common_array_int16_field {TypeObjectUtils::build_common_struct_member(member_id_array_int16_field, member_flags_array_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int16_field, common_array_int16_field_ec))}; if (!common_array_int16_field_ec) @@ -6035,7 +5933,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint16_field = 0x00000024; + MemberId member_id_array_uint16_field = 0x00000023; bool common_array_uint16_field_ec {false}; CommonStructMember common_array_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint16_field, member_flags_array_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint16_field, common_array_uint16_field_ec))}; if (!common_array_uint16_field_ec) @@ -6099,7 +5997,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int32_field = 0x00000025; + MemberId member_id_array_int32_field = 0x00000024; bool common_array_int32_field_ec {false}; CommonStructMember common_array_int32_field {TypeObjectUtils::build_common_struct_member(member_id_array_int32_field, member_flags_array_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int32_field, common_array_int32_field_ec))}; if (!common_array_int32_field_ec) @@ -6163,7 +6061,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint32_field = 0x00000026; + MemberId member_id_array_uint32_field = 0x00000025; bool common_array_uint32_field_ec {false}; CommonStructMember common_array_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint32_field, member_flags_array_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint32_field, common_array_uint32_field_ec))}; if (!common_array_uint32_field_ec) @@ -6227,7 +6125,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int64_field = 0x00000027; + MemberId member_id_array_int64_field = 0x00000026; bool common_array_int64_field_ec {false}; CommonStructMember common_array_int64_field {TypeObjectUtils::build_common_struct_member(member_id_array_int64_field, member_flags_array_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int64_field, common_array_int64_field_ec))}; if (!common_array_int64_field_ec) @@ -6291,7 +6189,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint64_field = 0x00000028; + MemberId member_id_array_uint64_field = 0x00000027; bool common_array_uint64_field_ec {false}; CommonStructMember common_array_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint64_field, member_flags_array_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint64_field, common_array_uint64_field_ec))}; if (!common_array_uint64_field_ec) @@ -6355,7 +6253,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_float_field = 0x00000029; + MemberId member_id_array_float_field = 0x00000028; bool common_array_float_field_ec {false}; CommonStructMember common_array_float_field {TypeObjectUtils::build_common_struct_member(member_id_array_float_field, member_flags_array_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_float_field, common_array_float_field_ec))}; if (!common_array_float_field_ec) @@ -6419,7 +6317,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_double_field = 0x0000002a; + MemberId member_id_array_double_field = 0x00000029; bool common_array_double_field_ec {false}; CommonStructMember common_array_double_field {TypeObjectUtils::build_common_struct_member(member_id_array_double_field, member_flags_array_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_double_field, common_array_double_field_ec))}; if (!common_array_double_field_ec) @@ -6483,7 +6381,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_bool_field = 0x0000002b; + MemberId member_id_array_bool_field = 0x0000002a; bool common_array_bool_field_ec {false}; CommonStructMember common_array_bool_field {TypeObjectUtils::build_common_struct_member(member_id_array_bool_field, member_flags_array_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_bool_field, common_array_bool_field_ec))}; if (!common_array_bool_field_ec) @@ -6545,7 +6443,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum_field = 0x0000002c; + MemberId member_id_array_enum_field = 0x0000002b; bool common_array_enum_field_ec {false}; CommonStructMember common_array_enum_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum_field, member_flags_array_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum_field, common_array_enum_field_ec))}; if (!common_array_enum_field_ec) @@ -6607,7 +6505,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum2_field = 0x0000002d; + MemberId member_id_array_enum2_field = 0x0000002c; bool common_array_enum2_field_ec {false}; CommonStructMember common_array_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum2_field, member_flags_array_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum2_field, common_array_enum2_field_ec))}; if (!common_array_enum2_field_ec) @@ -6669,7 +6567,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_struct_field = 0x0000002e; + MemberId member_id_array_struct_field = 0x0000002d; bool common_array_struct_field_ec {false}; CommonStructMember common_array_struct_field {TypeObjectUtils::build_common_struct_member(member_id_array_struct_field, member_flags_array_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_struct_field, common_array_struct_field_ec))}; if (!common_array_struct_field_ec) @@ -6731,7 +6629,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_char_field = 0x0000002f; + MemberId member_id_bounded_sequence_char_field = 0x0000002e; bool common_bounded_sequence_char_field_ec {false}; CommonStructMember common_bounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_char_field, member_flags_bounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_char_field, common_bounded_sequence_char_field_ec))}; if (!common_bounded_sequence_char_field_ec) @@ -6793,7 +6691,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint8_field = 0x00000030; + MemberId member_id_bounded_sequence_uint8_field = 0x0000002f; bool common_bounded_sequence_uint8_field_ec {false}; CommonStructMember common_bounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint8_field, member_flags_bounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint8_field, common_bounded_sequence_uint8_field_ec))}; if (!common_bounded_sequence_uint8_field_ec) @@ -6855,7 +6753,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int16_field = 0x00000031; + MemberId member_id_bounded_sequence_int16_field = 0x00000030; bool common_bounded_sequence_int16_field_ec {false}; CommonStructMember common_bounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int16_field, member_flags_bounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int16_field, common_bounded_sequence_int16_field_ec))}; if (!common_bounded_sequence_int16_field_ec) @@ -6917,7 +6815,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint16_field = 0x00000032; + MemberId member_id_bounded_sequence_uint16_field = 0x00000031; bool common_bounded_sequence_uint16_field_ec {false}; CommonStructMember common_bounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint16_field, member_flags_bounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint16_field, common_bounded_sequence_uint16_field_ec))}; if (!common_bounded_sequence_uint16_field_ec) @@ -6979,7 +6877,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int32_field = 0x00000033; + MemberId member_id_bounded_sequence_int32_field = 0x00000032; bool common_bounded_sequence_int32_field_ec {false}; CommonStructMember common_bounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int32_field, member_flags_bounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int32_field, common_bounded_sequence_int32_field_ec))}; if (!common_bounded_sequence_int32_field_ec) @@ -7041,7 +6939,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint32_field = 0x00000034; + MemberId member_id_bounded_sequence_uint32_field = 0x00000033; bool common_bounded_sequence_uint32_field_ec {false}; CommonStructMember common_bounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint32_field, member_flags_bounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint32_field, common_bounded_sequence_uint32_field_ec))}; if (!common_bounded_sequence_uint32_field_ec) @@ -7103,7 +7001,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int64_field = 0x00000035; + MemberId member_id_bounded_sequence_int64_field = 0x00000034; bool common_bounded_sequence_int64_field_ec {false}; CommonStructMember common_bounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int64_field, member_flags_bounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int64_field, common_bounded_sequence_int64_field_ec))}; if (!common_bounded_sequence_int64_field_ec) @@ -7165,7 +7063,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint64_field = 0x00000036; + MemberId member_id_bounded_sequence_uint64_field = 0x00000035; bool common_bounded_sequence_uint64_field_ec {false}; CommonStructMember common_bounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint64_field, member_flags_bounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint64_field, common_bounded_sequence_uint64_field_ec))}; if (!common_bounded_sequence_uint64_field_ec) @@ -7227,7 +7125,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_float_field = 0x00000037; + MemberId member_id_bounded_sequence_float_field = 0x00000036; bool common_bounded_sequence_float_field_ec {false}; CommonStructMember common_bounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_float_field, member_flags_bounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_float_field, common_bounded_sequence_float_field_ec))}; if (!common_bounded_sequence_float_field_ec) @@ -7289,7 +7187,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_double_field = 0x00000038; + MemberId member_id_bounded_sequence_double_field = 0x00000037; bool common_bounded_sequence_double_field_ec {false}; CommonStructMember common_bounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_double_field, member_flags_bounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_double_field, common_bounded_sequence_double_field_ec))}; if (!common_bounded_sequence_double_field_ec) @@ -7351,7 +7249,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_bool_field = 0x00000039; + MemberId member_id_bounded_sequence_bool_field = 0x00000038; bool common_bounded_sequence_bool_field_ec {false}; CommonStructMember common_bounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_bool_field, member_flags_bounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_bool_field, common_bounded_sequence_bool_field_ec))}; if (!common_bounded_sequence_bool_field_ec) @@ -7411,7 +7309,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum_field = 0x0000003a; + MemberId member_id_bounded_sequence_enum_field = 0x00000039; bool common_bounded_sequence_enum_field_ec {false}; CommonStructMember common_bounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum_field, member_flags_bounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum_field, common_bounded_sequence_enum_field_ec))}; if (!common_bounded_sequence_enum_field_ec) @@ -7471,7 +7369,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum2_field = 0x0000003b; + MemberId member_id_bounded_sequence_enum2_field = 0x0000003a; bool common_bounded_sequence_enum2_field_ec {false}; CommonStructMember common_bounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum2_field, member_flags_bounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum2_field, common_bounded_sequence_enum2_field_ec))}; if (!common_bounded_sequence_enum2_field_ec) @@ -7531,7 +7429,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_struct_field = 0x0000003c; + MemberId member_id_bounded_sequence_struct_field = 0x0000003b; bool common_bounded_sequence_struct_field_ec {false}; CommonStructMember common_bounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_struct_field, member_flags_bounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_struct_field, common_bounded_sequence_struct_field_ec))}; if (!common_bounded_sequence_struct_field_ec) @@ -7593,7 +7491,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_char_field = 0x0000003d; + MemberId member_id_unbounded_sequence_char_field = 0x0000003c; bool common_unbounded_sequence_char_field_ec {false}; CommonStructMember common_unbounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_char_field, member_flags_unbounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_char_field, common_unbounded_sequence_char_field_ec))}; if (!common_unbounded_sequence_char_field_ec) @@ -7655,7 +7553,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint8_field = 0x0000003e; + MemberId member_id_unbounded_sequence_uint8_field = 0x0000003d; bool common_unbounded_sequence_uint8_field_ec {false}; CommonStructMember common_unbounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint8_field, member_flags_unbounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint8_field, common_unbounded_sequence_uint8_field_ec))}; if (!common_unbounded_sequence_uint8_field_ec) @@ -7717,7 +7615,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int16_field = 0x0000003f; + MemberId member_id_unbounded_sequence_int16_field = 0x0000003e; bool common_unbounded_sequence_int16_field_ec {false}; CommonStructMember common_unbounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int16_field, member_flags_unbounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int16_field, common_unbounded_sequence_int16_field_ec))}; if (!common_unbounded_sequence_int16_field_ec) @@ -7779,7 +7677,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint16_field = 0x00000040; + MemberId member_id_unbounded_sequence_uint16_field = 0x0000003f; bool common_unbounded_sequence_uint16_field_ec {false}; CommonStructMember common_unbounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint16_field, member_flags_unbounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint16_field, common_unbounded_sequence_uint16_field_ec))}; if (!common_unbounded_sequence_uint16_field_ec) @@ -7841,7 +7739,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int32_field = 0x00000041; + MemberId member_id_unbounded_sequence_int32_field = 0x00000040; bool common_unbounded_sequence_int32_field_ec {false}; CommonStructMember common_unbounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int32_field, member_flags_unbounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int32_field, common_unbounded_sequence_int32_field_ec))}; if (!common_unbounded_sequence_int32_field_ec) @@ -7903,7 +7801,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint32_field = 0x00000042; + MemberId member_id_unbounded_sequence_uint32_field = 0x00000041; bool common_unbounded_sequence_uint32_field_ec {false}; CommonStructMember common_unbounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint32_field, member_flags_unbounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint32_field, common_unbounded_sequence_uint32_field_ec))}; if (!common_unbounded_sequence_uint32_field_ec) @@ -7965,7 +7863,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int64_field = 0x00000043; + MemberId member_id_unbounded_sequence_int64_field = 0x00000042; bool common_unbounded_sequence_int64_field_ec {false}; CommonStructMember common_unbounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int64_field, member_flags_unbounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int64_field, common_unbounded_sequence_int64_field_ec))}; if (!common_unbounded_sequence_int64_field_ec) @@ -8027,7 +7925,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint64_field = 0x00000044; + MemberId member_id_unbounded_sequence_uint64_field = 0x00000043; bool common_unbounded_sequence_uint64_field_ec {false}; CommonStructMember common_unbounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint64_field, member_flags_unbounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint64_field, common_unbounded_sequence_uint64_field_ec))}; if (!common_unbounded_sequence_uint64_field_ec) @@ -8089,7 +7987,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_float_field = 0x00000045; + MemberId member_id_unbounded_sequence_float_field = 0x00000044; bool common_unbounded_sequence_float_field_ec {false}; CommonStructMember common_unbounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_float_field, member_flags_unbounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_float_field, common_unbounded_sequence_float_field_ec))}; if (!common_unbounded_sequence_float_field_ec) @@ -8151,7 +8049,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_double_field = 0x00000046; + MemberId member_id_unbounded_sequence_double_field = 0x00000045; bool common_unbounded_sequence_double_field_ec {false}; CommonStructMember common_unbounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_double_field, member_flags_unbounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_double_field, common_unbounded_sequence_double_field_ec))}; if (!common_unbounded_sequence_double_field_ec) @@ -8213,7 +8111,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_bool_field = 0x00000047; + MemberId member_id_unbounded_sequence_bool_field = 0x00000046; bool common_unbounded_sequence_bool_field_ec {false}; CommonStructMember common_unbounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_bool_field, member_flags_unbounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_bool_field, common_unbounded_sequence_bool_field_ec))}; if (!common_unbounded_sequence_bool_field_ec) @@ -8273,7 +8171,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum_field = 0x00000048; + MemberId member_id_unbounded_sequence_enum_field = 0x00000047; bool common_unbounded_sequence_enum_field_ec {false}; CommonStructMember common_unbounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum_field, member_flags_unbounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum_field, common_unbounded_sequence_enum_field_ec))}; if (!common_unbounded_sequence_enum_field_ec) @@ -8333,7 +8231,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum2_field = 0x00000049; + MemberId member_id_unbounded_sequence_enum2_field = 0x00000048; bool common_unbounded_sequence_enum2_field_ec {false}; CommonStructMember common_unbounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum2_field, member_flags_unbounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum2_field, common_unbounded_sequence_enum2_field_ec))}; if (!common_unbounded_sequence_enum2_field_ec) @@ -8393,7 +8291,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_struct_field = 0x0000004a; + MemberId member_id_unbounded_sequence_struct_field = 0x00000049; bool common_unbounded_sequence_struct_field_ec {false}; CommonStructMember common_unbounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_struct_field, member_flags_unbounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_struct_field, common_unbounded_sequence_struct_field_ec))}; if (!common_unbounded_sequence_struct_field_ec) From fb1fe19aac040e2a979af1b2f9a691673ba93196 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Mon, 24 Feb 2025 10:05:48 +0100 Subject: [PATCH 05/10] Refs #22835. Add SWIG interface for fixed_size_string. Signed-off-by: Miguel Company --- .../src/swig/fastcdr/cdr/fixed_size_string.i | 22 +++++++++++++++++++ fastdds_python/src/swig/fastdds.i | 1 + 2 files changed, 23 insertions(+) create mode 100644 fastdds_python/src/swig/fastcdr/cdr/fixed_size_string.i diff --git a/fastdds_python/src/swig/fastcdr/cdr/fixed_size_string.i b/fastdds_python/src/swig/fastcdr/cdr/fixed_size_string.i new file mode 100644 index 00000000..3bd3c5fe --- /dev/null +++ b/fastdds_python/src/swig/fastcdr/cdr/fixed_size_string.i @@ -0,0 +1,22 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +%{ +#include "fastcdr/cdr/fixed_size_string.hpp" +%} + +// Ignore method that causes warnings on SWIG +%ignore eprosima::fastcdr::fixed_string::operator const char*() const; + +%include "fastcdr/cdr/fixed_size_string.hpp" diff --git a/fastdds_python/src/swig/fastdds.i b/fastdds_python/src/swig/fastdds.i index fc66930c..ff98901e 100644 --- a/fastdds_python/src/swig/fastdds.i +++ b/fastdds_python/src/swig/fastdds.i @@ -136,6 +136,7 @@ namespace xtypes { #ifndef FASTDDS_DOCS_BUILD %include %include "fastcdr/xcdr/optional.i" +%include "fastcdr/cdr/fixed_size_string.i" #endif %include "fastdds/LibrarySettings.i" From b84b0a68330979bef587513d4bd7fb95fdbbe71a Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Mon, 24 Feb 2025 12:19:55 +0100 Subject: [PATCH 06/10] Refs #22835. Added fixed_string_field to test_modules.idl Signed-off-by: Miguel Company --- fastdds_python/test/types/test_modules.hpp | 141 ++++ fastdds_python/test/types/test_modules.i | 33 + fastdds_python/test/types/test_modules.idl | 3 + .../test/types/test_modulesCdrAux.hpp | 6 +- .../test/types/test_modulesCdrAux.ipp | 749 +++++++++--------- .../types/test_modulesTypeObjectSupport.cxx | 358 ++++++--- 6 files changed, 805 insertions(+), 485 deletions(-) diff --git a/fastdds_python/test/types/test_modules.hpp b/fastdds_python/test/types/test_modules.hpp index ddf9509c..ff7cc9aa 100644 --- a/fastdds_python/test/types/test_modules.hpp +++ b/fastdds_python/test/types/test_modules.hpp @@ -136,6 +136,8 @@ class StructType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -161,6 +163,7 @@ class StructType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; } @@ -197,6 +200,8 @@ class StructType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -224,6 +229,7 @@ class StructType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; return *this; @@ -248,6 +254,7 @@ class StructType m_double_field == x.m_double_field && m_bool_field == x.m_bool_field && m_string_field == x.m_string_field && + m_fixed_string_field == x.m_fixed_string_field && m_enum_field == x.m_enum_field && m_enum2_field == x.m_enum2_field); } @@ -620,6 +627,45 @@ class StructType } + /*! + * @brief This function copies the value in member fixed_string_field + * @param _fixed_string_field New value to be copied in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + const eprosima::fastcdr::fixed_string<16>& _fixed_string_field) + { + m_fixed_string_field = _fixed_string_field; + } + + /*! + * @brief This function moves the value in member fixed_string_field + * @param _fixed_string_field New value to be moved in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + eprosima::fastcdr::fixed_string<16>&& _fixed_string_field) + { + m_fixed_string_field = std::move(_fixed_string_field); + } + + /*! + * @brief This function returns a constant reference to member fixed_string_field + * @return Constant reference to member fixed_string_field + */ + eProsima_user_DllExport const eprosima::fastcdr::fixed_string<16>& fixed_string_field() const + { + return m_fixed_string_field; + } + + /*! + * @brief This function returns a reference to member fixed_string_field + * @return Reference to member fixed_string_field + */ + eProsima_user_DllExport eprosima::fastcdr::fixed_string<16>& fixed_string_field() + { + return m_fixed_string_field; + } + + /*! * @brief This function sets a value in member enum_field * @param _enum_field New value for member enum_field @@ -693,6 +739,7 @@ class StructType double m_double_field{0.0}; bool m_bool_field{false}; std::string m_string_field; + eprosima::fastcdr::fixed_string<16> m_fixed_string_field; Color m_enum_field{Color::RED}; Material m_enum2_field{Material::WOOD}; @@ -752,6 +799,8 @@ class CompleteTestType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -893,6 +942,7 @@ class CompleteTestType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; m_struct_field = std::move(x.m_struct_field); @@ -987,6 +1037,8 @@ class CompleteTestType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -1130,6 +1182,7 @@ class CompleteTestType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; m_struct_field = std::move(x.m_struct_field); @@ -1212,6 +1265,7 @@ class CompleteTestType m_double_field == x.m_double_field && m_bool_field == x.m_bool_field && m_string_field == x.m_string_field && + m_fixed_string_field == x.m_fixed_string_field && m_enum_field == x.m_enum_field && m_enum2_field == x.m_enum2_field && m_struct_field == x.m_struct_field && @@ -1642,6 +1696,45 @@ class CompleteTestType } + /*! + * @brief This function copies the value in member fixed_string_field + * @param _fixed_string_field New value to be copied in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + const eprosima::fastcdr::fixed_string<16>& _fixed_string_field) + { + m_fixed_string_field = _fixed_string_field; + } + + /*! + * @brief This function moves the value in member fixed_string_field + * @param _fixed_string_field New value to be moved in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + eprosima::fastcdr::fixed_string<16>&& _fixed_string_field) + { + m_fixed_string_field = std::move(_fixed_string_field); + } + + /*! + * @brief This function returns a constant reference to member fixed_string_field + * @return Constant reference to member fixed_string_field + */ + eProsima_user_DllExport const eprosima::fastcdr::fixed_string<16>& fixed_string_field() const + { + return m_fixed_string_field; + } + + /*! + * @brief This function returns a reference to member fixed_string_field + * @return Reference to member fixed_string_field + */ + eProsima_user_DllExport eprosima::fastcdr::fixed_string<16>& fixed_string_field() + { + return m_fixed_string_field; + } + + /*! * @brief This function sets a value in member enum_field * @param _enum_field New value for member enum_field @@ -3977,6 +4070,7 @@ class CompleteTestType double m_double_field{0.0}; bool m_bool_field{false}; std::string m_string_field; + eprosima::fastcdr::fixed_string<16> m_fixed_string_field; Color m_enum_field{Color::RED}; Material m_enum2_field{Material::WOOD}; StructType m_struct_field; @@ -4094,6 +4188,8 @@ class KeyedCompleteTestType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -4236,6 +4332,7 @@ class KeyedCompleteTestType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; m_struct_field = std::move(x.m_struct_field); @@ -4332,6 +4429,8 @@ class KeyedCompleteTestType m_string_field = x.m_string_field; + m_fixed_string_field = x.m_fixed_string_field; + m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; @@ -4476,6 +4575,7 @@ class KeyedCompleteTestType m_double_field = x.m_double_field; m_bool_field = x.m_bool_field; m_string_field = std::move(x.m_string_field); + m_fixed_string_field = std::move(x.m_fixed_string_field); m_enum_field = x.m_enum_field; m_enum2_field = x.m_enum2_field; m_struct_field = std::move(x.m_struct_field); @@ -4559,6 +4659,7 @@ class KeyedCompleteTestType m_double_field == x.m_double_field && m_bool_field == x.m_bool_field && m_string_field == x.m_string_field && + m_fixed_string_field == x.m_fixed_string_field && m_enum_field == x.m_enum_field && m_enum2_field == x.m_enum2_field && m_struct_field == x.m_struct_field && @@ -5018,6 +5119,45 @@ class KeyedCompleteTestType } + /*! + * @brief This function copies the value in member fixed_string_field + * @param _fixed_string_field New value to be copied in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + const eprosima::fastcdr::fixed_string<16>& _fixed_string_field) + { + m_fixed_string_field = _fixed_string_field; + } + + /*! + * @brief This function moves the value in member fixed_string_field + * @param _fixed_string_field New value to be moved in member fixed_string_field + */ + eProsima_user_DllExport void fixed_string_field( + eprosima::fastcdr::fixed_string<16>&& _fixed_string_field) + { + m_fixed_string_field = std::move(_fixed_string_field); + } + + /*! + * @brief This function returns a constant reference to member fixed_string_field + * @return Constant reference to member fixed_string_field + */ + eProsima_user_DllExport const eprosima::fastcdr::fixed_string<16>& fixed_string_field() const + { + return m_fixed_string_field; + } + + /*! + * @brief This function returns a reference to member fixed_string_field + * @return Reference to member fixed_string_field + */ + eProsima_user_DllExport eprosima::fastcdr::fixed_string<16>& fixed_string_field() + { + return m_fixed_string_field; + } + + /*! * @brief This function sets a value in member enum_field * @param _enum_field New value for member enum_field @@ -7354,6 +7494,7 @@ class KeyedCompleteTestType double m_double_field{0.0}; bool m_bool_field{false}; std::string m_string_field; + eprosima::fastcdr::fixed_string<16> m_fixed_string_field; Color m_enum_field{Color::RED}; Material m_enum2_field{Material::WOOD}; StructType m_struct_field; diff --git a/fastdds_python/test/types/test_modules.i b/fastdds_python/test/types/test_modules.i index 1f75ce47..cc3c53d6 100644 --- a/fastdds_python/test/types/test_modules.i +++ b/fastdds_python/test/types/test_modules.i @@ -215,6 +215,17 @@ namespace swig { +%ignore eprosima::test::StructType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&); + + +// Overloaded getter methods shadow each other and are equivalent in python +// Const accesors produced constant enums instead of arrays/dictionaries when used +// We ignore them to prevent this +%ignore eprosima::test::StructType::fixed_string_field(); +%rename("%s") eprosima::test::StructType::fixed_string_field() const; + + + %ignore eprosima::test::StructType::enum_field(eprosima::test::Color&&); @@ -394,6 +405,17 @@ namespace swig { +%ignore eprosima::test::CompleteTestType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&); + + +// Overloaded getter methods shadow each other and are equivalent in python +// Const accesors produced constant enums instead of arrays/dictionaries when used +// We ignore them to prevent this +%ignore eprosima::test::CompleteTestType::fixed_string_field(); +%rename("%s") eprosima::test::CompleteTestType::fixed_string_field() const; + + + %ignore eprosima::test::CompleteTestType::enum_field(eprosima::test::Color&&); @@ -1628,6 +1650,17 @@ namespace swig { +%ignore eprosima::test::KeyedCompleteTestType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&); + + +// Overloaded getter methods shadow each other and are equivalent in python +// Const accesors produced constant enums instead of arrays/dictionaries when used +// We ignore them to prevent this +%ignore eprosima::test::KeyedCompleteTestType::fixed_string_field(); +%rename("%s") eprosima::test::KeyedCompleteTestType::fixed_string_field() const; + + + %ignore eprosima::test::KeyedCompleteTestType::enum_field(eprosima::test::Color&&); diff --git a/fastdds_python/test/types/test_modules.idl b/fastdds_python/test/types/test_modules.idl index 4b674cdf..08fbf710 100644 --- a/fastdds_python/test/types/test_modules.idl +++ b/fastdds_python/test/types/test_modules.idl @@ -35,6 +35,7 @@ module eprosima //long double long_double_field; boolean bool_field; string string_field; + string<16> fixed_string_field; Color enum_field; Material enum2_field; }; @@ -58,6 +59,7 @@ module eprosima //long double long_double_field; boolean bool_field; string string_field; + string<16> fixed_string_field; Color enum_field; Material enum2_field; StructType struct_field; @@ -154,6 +156,7 @@ module eprosima //long double long_double_field; boolean bool_field; string string_field; + string<16> fixed_string_field; Color enum_field; Material enum2_field; StructType struct_field; diff --git a/fastdds_python/test/types/test_modulesCdrAux.hpp b/fastdds_python/test/types/test_modulesCdrAux.hpp index c9e196a2..74824fe1 100644 --- a/fastdds_python/test/types/test_modulesCdrAux.hpp +++ b/fastdds_python/test/types/test_modulesCdrAux.hpp @@ -24,14 +24,14 @@ #include "test_modules.hpp" -constexpr uint32_t eprosima_test_KeyedCompleteTestType_max_cdr_typesize {4620UL}; +constexpr uint32_t eprosima_test_KeyedCompleteTestType_max_cdr_typesize {4884UL}; constexpr uint32_t eprosima_test_KeyedCompleteTestType_max_key_cdr_typesize {4UL}; -constexpr uint32_t eprosima_test_CompleteTestType_max_cdr_typesize {4620UL}; +constexpr uint32_t eprosima_test_CompleteTestType_max_cdr_typesize {4884UL}; constexpr uint32_t eprosima_test_CompleteTestType_max_key_cdr_typesize {0UL}; -constexpr uint32_t eprosima_test_StructType_max_cdr_typesize {328UL}; +constexpr uint32_t eprosima_test_StructType_max_cdr_typesize {352UL}; constexpr uint32_t eprosima_test_StructType_max_key_cdr_typesize {0UL}; diff --git a/fastdds_python/test/types/test_modulesCdrAux.ipp b/fastdds_python/test/types/test_modulesCdrAux.ipp index a22314d9..9dfe09db 100644 --- a/fastdds_python/test/types/test_modulesCdrAux.ipp +++ b/fastdds_python/test/types/test_modulesCdrAux.ipp @@ -89,9 +89,12 @@ eProsima_user_DllExport size_t calculate_serialized_size( data.string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(12), - data.enum_field(), current_alignment); + data.fixed_string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(13), + data.enum_field(), current_alignment); + + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(14), data.enum2_field(), current_alignment); @@ -126,8 +129,9 @@ eProsima_user_DllExport void serialize( << eprosima::fastcdr::MemberId(9) << data.double_field() << eprosima::fastcdr::MemberId(10) << data.bool_field() << eprosima::fastcdr::MemberId(11) << data.string_field() - << eprosima::fastcdr::MemberId(12) << data.enum_field() - << eprosima::fastcdr::MemberId(13) << data.enum2_field() + << eprosima::fastcdr::MemberId(12) << data.fixed_string_field() + << eprosima::fastcdr::MemberId(13) << data.enum_field() + << eprosima::fastcdr::MemberId(14) << data.enum2_field() ; scdr.end_serialize_type(current_state); } @@ -196,10 +200,14 @@ eProsima_user_DllExport void deserialize( break; case 12: - dcdr >> data.enum_field(); + dcdr >> data.fixed_string_field(); break; case 13: + dcdr >> data.enum_field(); + break; + + case 14: dcdr >> data.enum2_field(); break; @@ -243,6 +251,8 @@ void serialize_key( scdr << data.string_field(); + scdr << data.fixed_string_field(); + scdr << data.enum_field(); scdr << data.enum2_field(); @@ -305,183 +315,186 @@ eProsima_user_DllExport size_t calculate_serialized_size( data.string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(12), - data.enum_field(), current_alignment); + data.fixed_string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(13), - data.enum2_field(), current_alignment); + data.enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(14), - data.struct_field(), current_alignment); + data.enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(15), - data.char_opt_field(), current_alignment); + data.struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(16), - data.uint8_opt_field(), current_alignment); + data.char_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(17), - data.int16_opt_field(), current_alignment); + data.uint8_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(18), - data.uint16_opt_field(), current_alignment); + data.int16_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(19), - data.int32_opt_field(), current_alignment); + data.uint16_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(20), - data.uint32_opt_field(), current_alignment); + data.int32_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(21), - data.int64_opt_field(), current_alignment); + data.uint32_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(22), - data.uint64_opt_field(), current_alignment); + data.int64_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(23), - data.float_opt_field(), current_alignment); + data.uint64_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(24), - data.double_opt_field(), current_alignment); + data.float_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(25), - data.bool_opt_field(), current_alignment); + data.double_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(26), - data.string_opt_field(), current_alignment); + data.bool_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(27), - data.enum_opt_field(), current_alignment); + data.string_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(28), - data.enum2_opt_field(), current_alignment); + data.enum_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(29), - data.struct_opt_field(), current_alignment); + data.enum2_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(30), - data.array_char_field(), current_alignment); + data.struct_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(31), - data.array_uint8_field(), current_alignment); + data.array_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(32), - data.array_int16_field(), current_alignment); + data.array_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(33), - data.array_uint16_field(), current_alignment); + data.array_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(34), - data.array_int32_field(), current_alignment); + data.array_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(35), - data.array_uint32_field(), current_alignment); + data.array_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(36), - data.array_int64_field(), current_alignment); + data.array_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(37), - data.array_uint64_field(), current_alignment); + data.array_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(38), - data.array_float_field(), current_alignment); + data.array_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(39), - data.array_double_field(), current_alignment); + data.array_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(40), - data.array_bool_field(), current_alignment); + data.array_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(41), - data.array_enum_field(), current_alignment); + data.array_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(42), - data.array_enum2_field(), current_alignment); + data.array_enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(43), - data.array_struct_field(), current_alignment); + data.array_enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(44), - data.bounded_sequence_char_field(), current_alignment); + data.array_struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(45), - data.bounded_sequence_uint8_field(), current_alignment); + data.bounded_sequence_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(46), - data.bounded_sequence_int16_field(), current_alignment); + data.bounded_sequence_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(47), - data.bounded_sequence_uint16_field(), current_alignment); + data.bounded_sequence_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(48), - data.bounded_sequence_int32_field(), current_alignment); + data.bounded_sequence_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(49), - data.bounded_sequence_uint32_field(), current_alignment); + data.bounded_sequence_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(50), - data.bounded_sequence_int64_field(), current_alignment); + data.bounded_sequence_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(51), - data.bounded_sequence_uint64_field(), current_alignment); + data.bounded_sequence_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(52), - data.bounded_sequence_float_field(), current_alignment); + data.bounded_sequence_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(53), - data.bounded_sequence_double_field(), current_alignment); + data.bounded_sequence_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(54), - data.bounded_sequence_bool_field(), current_alignment); + data.bounded_sequence_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(55), - data.bounded_sequence_enum_field(), current_alignment); + data.bounded_sequence_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(56), - data.bounded_sequence_enum2_field(), current_alignment); + data.bounded_sequence_enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(57), - data.bounded_sequence_struct_field(), current_alignment); + data.bounded_sequence_enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(58), - data.unbounded_sequence_char_field(), current_alignment); + data.bounded_sequence_struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(59), - data.unbounded_sequence_uint8_field(), current_alignment); + data.unbounded_sequence_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(60), - data.unbounded_sequence_int16_field(), current_alignment); + data.unbounded_sequence_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(61), - data.unbounded_sequence_uint16_field(), current_alignment); + data.unbounded_sequence_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(62), - data.unbounded_sequence_int32_field(), current_alignment); + data.unbounded_sequence_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(63), - data.unbounded_sequence_uint32_field(), current_alignment); + data.unbounded_sequence_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(64), - data.unbounded_sequence_int64_field(), current_alignment); + data.unbounded_sequence_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(65), - data.unbounded_sequence_uint64_field(), current_alignment); + data.unbounded_sequence_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(66), - data.unbounded_sequence_float_field(), current_alignment); + data.unbounded_sequence_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(67), - data.unbounded_sequence_double_field(), current_alignment); + data.unbounded_sequence_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(68), - data.unbounded_sequence_bool_field(), current_alignment); + data.unbounded_sequence_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(69), - data.unbounded_sequence_enum_field(), current_alignment); + data.unbounded_sequence_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(70), - data.unbounded_sequence_enum2_field(), current_alignment); + data.unbounded_sequence_enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(71), + data.unbounded_sequence_enum2_field(), current_alignment); + + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(72), data.unbounded_sequence_struct_field(), current_alignment); @@ -516,66 +529,67 @@ eProsima_user_DllExport void serialize( << eprosima::fastcdr::MemberId(9) << data.double_field() << eprosima::fastcdr::MemberId(10) << data.bool_field() << eprosima::fastcdr::MemberId(11) << data.string_field() - << eprosima::fastcdr::MemberId(12) << data.enum_field() - << eprosima::fastcdr::MemberId(13) << data.enum2_field() - << eprosima::fastcdr::MemberId(14) << data.struct_field() - << eprosima::fastcdr::MemberId(15) << data.char_opt_field() - << eprosima::fastcdr::MemberId(16) << data.uint8_opt_field() - << eprosima::fastcdr::MemberId(17) << data.int16_opt_field() - << eprosima::fastcdr::MemberId(18) << data.uint16_opt_field() - << eprosima::fastcdr::MemberId(19) << data.int32_opt_field() - << eprosima::fastcdr::MemberId(20) << data.uint32_opt_field() - << eprosima::fastcdr::MemberId(21) << data.int64_opt_field() - << eprosima::fastcdr::MemberId(22) << data.uint64_opt_field() - << eprosima::fastcdr::MemberId(23) << data.float_opt_field() - << eprosima::fastcdr::MemberId(24) << data.double_opt_field() - << eprosima::fastcdr::MemberId(25) << data.bool_opt_field() - << eprosima::fastcdr::MemberId(26) << data.string_opt_field() - << eprosima::fastcdr::MemberId(27) << data.enum_opt_field() - << eprosima::fastcdr::MemberId(28) << data.enum2_opt_field() - << eprosima::fastcdr::MemberId(29) << data.struct_opt_field() - << eprosima::fastcdr::MemberId(30) << data.array_char_field() - << eprosima::fastcdr::MemberId(31) << data.array_uint8_field() - << eprosima::fastcdr::MemberId(32) << data.array_int16_field() - << eprosima::fastcdr::MemberId(33) << data.array_uint16_field() - << eprosima::fastcdr::MemberId(34) << data.array_int32_field() - << eprosima::fastcdr::MemberId(35) << data.array_uint32_field() - << eprosima::fastcdr::MemberId(36) << data.array_int64_field() - << eprosima::fastcdr::MemberId(37) << data.array_uint64_field() - << eprosima::fastcdr::MemberId(38) << data.array_float_field() - << eprosima::fastcdr::MemberId(39) << data.array_double_field() - << eprosima::fastcdr::MemberId(40) << data.array_bool_field() - << eprosima::fastcdr::MemberId(41) << data.array_enum_field() - << eprosima::fastcdr::MemberId(42) << data.array_enum2_field() - << eprosima::fastcdr::MemberId(43) << data.array_struct_field() - << eprosima::fastcdr::MemberId(44) << data.bounded_sequence_char_field() - << eprosima::fastcdr::MemberId(45) << data.bounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(46) << data.bounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_float_field() - << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_double_field() - << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_struct_field() - << eprosima::fastcdr::MemberId(58) << data.unbounded_sequence_char_field() - << eprosima::fastcdr::MemberId(59) << data.unbounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(60) << data.unbounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_float_field() - << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_double_field() - << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(12) << data.fixed_string_field() + << eprosima::fastcdr::MemberId(13) << data.enum_field() + << eprosima::fastcdr::MemberId(14) << data.enum2_field() + << eprosima::fastcdr::MemberId(15) << data.struct_field() + << eprosima::fastcdr::MemberId(16) << data.char_opt_field() + << eprosima::fastcdr::MemberId(17) << data.uint8_opt_field() + << eprosima::fastcdr::MemberId(18) << data.int16_opt_field() + << eprosima::fastcdr::MemberId(19) << data.uint16_opt_field() + << eprosima::fastcdr::MemberId(20) << data.int32_opt_field() + << eprosima::fastcdr::MemberId(21) << data.uint32_opt_field() + << eprosima::fastcdr::MemberId(22) << data.int64_opt_field() + << eprosima::fastcdr::MemberId(23) << data.uint64_opt_field() + << eprosima::fastcdr::MemberId(24) << data.float_opt_field() + << eprosima::fastcdr::MemberId(25) << data.double_opt_field() + << eprosima::fastcdr::MemberId(26) << data.bool_opt_field() + << eprosima::fastcdr::MemberId(27) << data.string_opt_field() + << eprosima::fastcdr::MemberId(28) << data.enum_opt_field() + << eprosima::fastcdr::MemberId(29) << data.enum2_opt_field() + << eprosima::fastcdr::MemberId(30) << data.struct_opt_field() + << eprosima::fastcdr::MemberId(31) << data.array_char_field() + << eprosima::fastcdr::MemberId(32) << data.array_uint8_field() + << eprosima::fastcdr::MemberId(33) << data.array_int16_field() + << eprosima::fastcdr::MemberId(34) << data.array_uint16_field() + << eprosima::fastcdr::MemberId(35) << data.array_int32_field() + << eprosima::fastcdr::MemberId(36) << data.array_uint32_field() + << eprosima::fastcdr::MemberId(37) << data.array_int64_field() + << eprosima::fastcdr::MemberId(38) << data.array_uint64_field() + << eprosima::fastcdr::MemberId(39) << data.array_float_field() + << eprosima::fastcdr::MemberId(40) << data.array_double_field() + << eprosima::fastcdr::MemberId(41) << data.array_bool_field() + << eprosima::fastcdr::MemberId(42) << data.array_enum_field() + << eprosima::fastcdr::MemberId(43) << data.array_enum2_field() + << eprosima::fastcdr::MemberId(44) << data.array_struct_field() + << eprosima::fastcdr::MemberId(45) << data.bounded_sequence_char_field() + << eprosima::fastcdr::MemberId(46) << data.bounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_float_field() + << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_double_field() + << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(58) << data.bounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(59) << data.unbounded_sequence_char_field() + << eprosima::fastcdr::MemberId(60) << data.unbounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_float_field() + << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_double_field() + << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(72) << data.unbounded_sequence_struct_field() ; scdr.end_serialize_type(current_state); } @@ -644,242 +658,246 @@ eProsima_user_DllExport void deserialize( break; case 12: - dcdr >> data.enum_field(); + dcdr >> data.fixed_string_field(); break; case 13: - dcdr >> data.enum2_field(); + dcdr >> data.enum_field(); break; case 14: - dcdr >> data.struct_field(); + dcdr >> data.enum2_field(); break; case 15: - dcdr >> data.char_opt_field(); + dcdr >> data.struct_field(); break; case 16: - dcdr >> data.uint8_opt_field(); + dcdr >> data.char_opt_field(); break; case 17: - dcdr >> data.int16_opt_field(); + dcdr >> data.uint8_opt_field(); break; case 18: - dcdr >> data.uint16_opt_field(); + dcdr >> data.int16_opt_field(); break; case 19: - dcdr >> data.int32_opt_field(); + dcdr >> data.uint16_opt_field(); break; case 20: - dcdr >> data.uint32_opt_field(); + dcdr >> data.int32_opt_field(); break; case 21: - dcdr >> data.int64_opt_field(); + dcdr >> data.uint32_opt_field(); break; case 22: - dcdr >> data.uint64_opt_field(); + dcdr >> data.int64_opt_field(); break; case 23: - dcdr >> data.float_opt_field(); + dcdr >> data.uint64_opt_field(); break; case 24: - dcdr >> data.double_opt_field(); + dcdr >> data.float_opt_field(); break; case 25: - dcdr >> data.bool_opt_field(); + dcdr >> data.double_opt_field(); break; case 26: - dcdr >> data.string_opt_field(); + dcdr >> data.bool_opt_field(); break; case 27: - dcdr >> data.enum_opt_field(); + dcdr >> data.string_opt_field(); break; case 28: - dcdr >> data.enum2_opt_field(); + dcdr >> data.enum_opt_field(); break; case 29: - dcdr >> data.struct_opt_field(); + dcdr >> data.enum2_opt_field(); break; case 30: - dcdr >> data.array_char_field(); + dcdr >> data.struct_opt_field(); break; case 31: - dcdr >> data.array_uint8_field(); + dcdr >> data.array_char_field(); break; case 32: - dcdr >> data.array_int16_field(); + dcdr >> data.array_uint8_field(); break; case 33: - dcdr >> data.array_uint16_field(); + dcdr >> data.array_int16_field(); break; case 34: - dcdr >> data.array_int32_field(); + dcdr >> data.array_uint16_field(); break; case 35: - dcdr >> data.array_uint32_field(); + dcdr >> data.array_int32_field(); break; case 36: - dcdr >> data.array_int64_field(); + dcdr >> data.array_uint32_field(); break; case 37: - dcdr >> data.array_uint64_field(); + dcdr >> data.array_int64_field(); break; case 38: - dcdr >> data.array_float_field(); + dcdr >> data.array_uint64_field(); break; case 39: - dcdr >> data.array_double_field(); + dcdr >> data.array_float_field(); break; case 40: - dcdr >> data.array_bool_field(); + dcdr >> data.array_double_field(); break; case 41: - dcdr >> data.array_enum_field(); + dcdr >> data.array_bool_field(); break; case 42: - dcdr >> data.array_enum2_field(); + dcdr >> data.array_enum_field(); break; case 43: - dcdr >> data.array_struct_field(); + dcdr >> data.array_enum2_field(); break; case 44: - dcdr >> data.bounded_sequence_char_field(); + dcdr >> data.array_struct_field(); break; case 45: - dcdr >> data.bounded_sequence_uint8_field(); + dcdr >> data.bounded_sequence_char_field(); break; case 46: - dcdr >> data.bounded_sequence_int16_field(); + dcdr >> data.bounded_sequence_uint8_field(); break; case 47: - dcdr >> data.bounded_sequence_uint16_field(); + dcdr >> data.bounded_sequence_int16_field(); break; case 48: - dcdr >> data.bounded_sequence_int32_field(); + dcdr >> data.bounded_sequence_uint16_field(); break; case 49: - dcdr >> data.bounded_sequence_uint32_field(); + dcdr >> data.bounded_sequence_int32_field(); break; case 50: - dcdr >> data.bounded_sequence_int64_field(); + dcdr >> data.bounded_sequence_uint32_field(); break; case 51: - dcdr >> data.bounded_sequence_uint64_field(); + dcdr >> data.bounded_sequence_int64_field(); break; case 52: - dcdr >> data.bounded_sequence_float_field(); + dcdr >> data.bounded_sequence_uint64_field(); break; case 53: - dcdr >> data.bounded_sequence_double_field(); + dcdr >> data.bounded_sequence_float_field(); break; case 54: - dcdr >> data.bounded_sequence_bool_field(); + dcdr >> data.bounded_sequence_double_field(); break; case 55: - dcdr >> data.bounded_sequence_enum_field(); + dcdr >> data.bounded_sequence_bool_field(); break; case 56: - dcdr >> data.bounded_sequence_enum2_field(); + dcdr >> data.bounded_sequence_enum_field(); break; case 57: - dcdr >> data.bounded_sequence_struct_field(); + dcdr >> data.bounded_sequence_enum2_field(); break; case 58: - dcdr >> data.unbounded_sequence_char_field(); + dcdr >> data.bounded_sequence_struct_field(); break; case 59: - dcdr >> data.unbounded_sequence_uint8_field(); + dcdr >> data.unbounded_sequence_char_field(); break; case 60: - dcdr >> data.unbounded_sequence_int16_field(); + dcdr >> data.unbounded_sequence_uint8_field(); break; case 61: - dcdr >> data.unbounded_sequence_uint16_field(); + dcdr >> data.unbounded_sequence_int16_field(); break; case 62: - dcdr >> data.unbounded_sequence_int32_field(); + dcdr >> data.unbounded_sequence_uint16_field(); break; case 63: - dcdr >> data.unbounded_sequence_uint32_field(); + dcdr >> data.unbounded_sequence_int32_field(); break; case 64: - dcdr >> data.unbounded_sequence_int64_field(); + dcdr >> data.unbounded_sequence_uint32_field(); break; case 65: - dcdr >> data.unbounded_sequence_uint64_field(); + dcdr >> data.unbounded_sequence_int64_field(); break; case 66: - dcdr >> data.unbounded_sequence_float_field(); + dcdr >> data.unbounded_sequence_uint64_field(); break; case 67: - dcdr >> data.unbounded_sequence_double_field(); + dcdr >> data.unbounded_sequence_float_field(); break; case 68: - dcdr >> data.unbounded_sequence_bool_field(); + dcdr >> data.unbounded_sequence_double_field(); break; case 69: - dcdr >> data.unbounded_sequence_enum_field(); + dcdr >> data.unbounded_sequence_bool_field(); break; case 70: - dcdr >> data.unbounded_sequence_enum2_field(); + dcdr >> data.unbounded_sequence_enum_field(); break; case 71: + dcdr >> data.unbounded_sequence_enum2_field(); + break; + + case 72: dcdr >> data.unbounded_sequence_struct_field(); break; @@ -987,6 +1005,8 @@ void serialize_key( scdr << data.string_field(); + scdr << data.fixed_string_field(); + scdr << data.enum_field(); scdr << data.enum2_field(); @@ -1213,183 +1233,186 @@ eProsima_user_DllExport size_t calculate_serialized_size( data.string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(13), - data.enum_field(), current_alignment); + data.fixed_string_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(14), - data.enum2_field(), current_alignment); + data.enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(15), - data.struct_field(), current_alignment); + data.enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(16), - data.char_opt_field(), current_alignment); + data.struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(17), - data.uint8_opt_field(), current_alignment); + data.char_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(18), - data.int16_opt_field(), current_alignment); + data.uint8_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(19), - data.uint16_opt_field(), current_alignment); + data.int16_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(20), - data.int32_opt_field(), current_alignment); + data.uint16_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(21), - data.uint32_opt_field(), current_alignment); + data.int32_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(22), - data.int64_opt_field(), current_alignment); + data.uint32_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(23), - data.uint64_opt_field(), current_alignment); + data.int64_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(24), - data.float_opt_field(), current_alignment); + data.uint64_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(25), - data.double_opt_field(), current_alignment); + data.float_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(26), - data.bool_opt_field(), current_alignment); + data.double_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(27), - data.string_opt_field(), current_alignment); + data.bool_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(28), - data.enum_opt_field(), current_alignment); + data.string_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(29), - data.enum2_opt_field(), current_alignment); + data.enum_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(30), - data.struct_opt_field(), current_alignment); + data.enum2_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(31), - data.array_char_field(), current_alignment); + data.struct_opt_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(32), - data.array_uint8_field(), current_alignment); + data.array_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(33), - data.array_int16_field(), current_alignment); + data.array_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(34), - data.array_uint16_field(), current_alignment); + data.array_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(35), - data.array_int32_field(), current_alignment); + data.array_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(36), - data.array_uint32_field(), current_alignment); + data.array_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(37), - data.array_int64_field(), current_alignment); + data.array_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(38), - data.array_uint64_field(), current_alignment); + data.array_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(39), - data.array_float_field(), current_alignment); + data.array_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(40), - data.array_double_field(), current_alignment); + data.array_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(41), - data.array_bool_field(), current_alignment); + data.array_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(42), - data.array_enum_field(), current_alignment); + data.array_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(43), - data.array_enum2_field(), current_alignment); + data.array_enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(44), - data.array_struct_field(), current_alignment); + data.array_enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(45), - data.bounded_sequence_char_field(), current_alignment); + data.array_struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(46), - data.bounded_sequence_uint8_field(), current_alignment); + data.bounded_sequence_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(47), - data.bounded_sequence_int16_field(), current_alignment); + data.bounded_sequence_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(48), - data.bounded_sequence_uint16_field(), current_alignment); + data.bounded_sequence_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(49), - data.bounded_sequence_int32_field(), current_alignment); + data.bounded_sequence_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(50), - data.bounded_sequence_uint32_field(), current_alignment); + data.bounded_sequence_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(51), - data.bounded_sequence_int64_field(), current_alignment); + data.bounded_sequence_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(52), - data.bounded_sequence_uint64_field(), current_alignment); + data.bounded_sequence_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(53), - data.bounded_sequence_float_field(), current_alignment); + data.bounded_sequence_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(54), - data.bounded_sequence_double_field(), current_alignment); + data.bounded_sequence_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(55), - data.bounded_sequence_bool_field(), current_alignment); + data.bounded_sequence_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(56), - data.bounded_sequence_enum_field(), current_alignment); + data.bounded_sequence_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(57), - data.bounded_sequence_enum2_field(), current_alignment); + data.bounded_sequence_enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(58), - data.bounded_sequence_struct_field(), current_alignment); + data.bounded_sequence_enum2_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(59), - data.unbounded_sequence_char_field(), current_alignment); + data.bounded_sequence_struct_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(60), - data.unbounded_sequence_uint8_field(), current_alignment); + data.unbounded_sequence_char_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(61), - data.unbounded_sequence_int16_field(), current_alignment); + data.unbounded_sequence_uint8_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(62), - data.unbounded_sequence_uint16_field(), current_alignment); + data.unbounded_sequence_int16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(63), - data.unbounded_sequence_int32_field(), current_alignment); + data.unbounded_sequence_uint16_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(64), - data.unbounded_sequence_uint32_field(), current_alignment); + data.unbounded_sequence_int32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(65), - data.unbounded_sequence_int64_field(), current_alignment); + data.unbounded_sequence_uint32_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(66), - data.unbounded_sequence_uint64_field(), current_alignment); + data.unbounded_sequence_int64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(67), - data.unbounded_sequence_float_field(), current_alignment); + data.unbounded_sequence_uint64_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(68), - data.unbounded_sequence_double_field(), current_alignment); + data.unbounded_sequence_float_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(69), - data.unbounded_sequence_bool_field(), current_alignment); + data.unbounded_sequence_double_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(70), - data.unbounded_sequence_enum_field(), current_alignment); + data.unbounded_sequence_bool_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(71), - data.unbounded_sequence_enum2_field(), current_alignment); + data.unbounded_sequence_enum_field(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(72), + data.unbounded_sequence_enum2_field(), current_alignment); + + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(73), data.unbounded_sequence_struct_field(), current_alignment); @@ -1425,66 +1448,67 @@ eProsima_user_DllExport void serialize( << eprosima::fastcdr::MemberId(10) << data.double_field() << eprosima::fastcdr::MemberId(11) << data.bool_field() << eprosima::fastcdr::MemberId(12) << data.string_field() - << eprosima::fastcdr::MemberId(13) << data.enum_field() - << eprosima::fastcdr::MemberId(14) << data.enum2_field() - << eprosima::fastcdr::MemberId(15) << data.struct_field() - << eprosima::fastcdr::MemberId(16) << data.char_opt_field() - << eprosima::fastcdr::MemberId(17) << data.uint8_opt_field() - << eprosima::fastcdr::MemberId(18) << data.int16_opt_field() - << eprosima::fastcdr::MemberId(19) << data.uint16_opt_field() - << eprosima::fastcdr::MemberId(20) << data.int32_opt_field() - << eprosima::fastcdr::MemberId(21) << data.uint32_opt_field() - << eprosima::fastcdr::MemberId(22) << data.int64_opt_field() - << eprosima::fastcdr::MemberId(23) << data.uint64_opt_field() - << eprosima::fastcdr::MemberId(24) << data.float_opt_field() - << eprosima::fastcdr::MemberId(25) << data.double_opt_field() - << eprosima::fastcdr::MemberId(26) << data.bool_opt_field() - << eprosima::fastcdr::MemberId(27) << data.string_opt_field() - << eprosima::fastcdr::MemberId(28) << data.enum_opt_field() - << eprosima::fastcdr::MemberId(29) << data.enum2_opt_field() - << eprosima::fastcdr::MemberId(30) << data.struct_opt_field() - << eprosima::fastcdr::MemberId(31) << data.array_char_field() - << eprosima::fastcdr::MemberId(32) << data.array_uint8_field() - << eprosima::fastcdr::MemberId(33) << data.array_int16_field() - << eprosima::fastcdr::MemberId(34) << data.array_uint16_field() - << eprosima::fastcdr::MemberId(35) << data.array_int32_field() - << eprosima::fastcdr::MemberId(36) << data.array_uint32_field() - << eprosima::fastcdr::MemberId(37) << data.array_int64_field() - << eprosima::fastcdr::MemberId(38) << data.array_uint64_field() - << eprosima::fastcdr::MemberId(39) << data.array_float_field() - << eprosima::fastcdr::MemberId(40) << data.array_double_field() - << eprosima::fastcdr::MemberId(41) << data.array_bool_field() - << eprosima::fastcdr::MemberId(42) << data.array_enum_field() - << eprosima::fastcdr::MemberId(43) << data.array_enum2_field() - << eprosima::fastcdr::MemberId(44) << data.array_struct_field() - << eprosima::fastcdr::MemberId(45) << data.bounded_sequence_char_field() - << eprosima::fastcdr::MemberId(46) << data.bounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_float_field() - << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_double_field() - << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(58) << data.bounded_sequence_struct_field() - << eprosima::fastcdr::MemberId(59) << data.unbounded_sequence_char_field() - << eprosima::fastcdr::MemberId(60) << data.unbounded_sequence_uint8_field() - << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_int16_field() - << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_uint16_field() - << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_int32_field() - << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_uint32_field() - << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_int64_field() - << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_uint64_field() - << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_float_field() - << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_double_field() - << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_bool_field() - << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_enum_field() - << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_enum2_field() - << eprosima::fastcdr::MemberId(72) << data.unbounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(13) << data.fixed_string_field() + << eprosima::fastcdr::MemberId(14) << data.enum_field() + << eprosima::fastcdr::MemberId(15) << data.enum2_field() + << eprosima::fastcdr::MemberId(16) << data.struct_field() + << eprosima::fastcdr::MemberId(17) << data.char_opt_field() + << eprosima::fastcdr::MemberId(18) << data.uint8_opt_field() + << eprosima::fastcdr::MemberId(19) << data.int16_opt_field() + << eprosima::fastcdr::MemberId(20) << data.uint16_opt_field() + << eprosima::fastcdr::MemberId(21) << data.int32_opt_field() + << eprosima::fastcdr::MemberId(22) << data.uint32_opt_field() + << eprosima::fastcdr::MemberId(23) << data.int64_opt_field() + << eprosima::fastcdr::MemberId(24) << data.uint64_opt_field() + << eprosima::fastcdr::MemberId(25) << data.float_opt_field() + << eprosima::fastcdr::MemberId(26) << data.double_opt_field() + << eprosima::fastcdr::MemberId(27) << data.bool_opt_field() + << eprosima::fastcdr::MemberId(28) << data.string_opt_field() + << eprosima::fastcdr::MemberId(29) << data.enum_opt_field() + << eprosima::fastcdr::MemberId(30) << data.enum2_opt_field() + << eprosima::fastcdr::MemberId(31) << data.struct_opt_field() + << eprosima::fastcdr::MemberId(32) << data.array_char_field() + << eprosima::fastcdr::MemberId(33) << data.array_uint8_field() + << eprosima::fastcdr::MemberId(34) << data.array_int16_field() + << eprosima::fastcdr::MemberId(35) << data.array_uint16_field() + << eprosima::fastcdr::MemberId(36) << data.array_int32_field() + << eprosima::fastcdr::MemberId(37) << data.array_uint32_field() + << eprosima::fastcdr::MemberId(38) << data.array_int64_field() + << eprosima::fastcdr::MemberId(39) << data.array_uint64_field() + << eprosima::fastcdr::MemberId(40) << data.array_float_field() + << eprosima::fastcdr::MemberId(41) << data.array_double_field() + << eprosima::fastcdr::MemberId(42) << data.array_bool_field() + << eprosima::fastcdr::MemberId(43) << data.array_enum_field() + << eprosima::fastcdr::MemberId(44) << data.array_enum2_field() + << eprosima::fastcdr::MemberId(45) << data.array_struct_field() + << eprosima::fastcdr::MemberId(46) << data.bounded_sequence_char_field() + << eprosima::fastcdr::MemberId(47) << data.bounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(48) << data.bounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(49) << data.bounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(50) << data.bounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(51) << data.bounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(52) << data.bounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(53) << data.bounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(54) << data.bounded_sequence_float_field() + << eprosima::fastcdr::MemberId(55) << data.bounded_sequence_double_field() + << eprosima::fastcdr::MemberId(56) << data.bounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(57) << data.bounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(58) << data.bounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(59) << data.bounded_sequence_struct_field() + << eprosima::fastcdr::MemberId(60) << data.unbounded_sequence_char_field() + << eprosima::fastcdr::MemberId(61) << data.unbounded_sequence_uint8_field() + << eprosima::fastcdr::MemberId(62) << data.unbounded_sequence_int16_field() + << eprosima::fastcdr::MemberId(63) << data.unbounded_sequence_uint16_field() + << eprosima::fastcdr::MemberId(64) << data.unbounded_sequence_int32_field() + << eprosima::fastcdr::MemberId(65) << data.unbounded_sequence_uint32_field() + << eprosima::fastcdr::MemberId(66) << data.unbounded_sequence_int64_field() + << eprosima::fastcdr::MemberId(67) << data.unbounded_sequence_uint64_field() + << eprosima::fastcdr::MemberId(68) << data.unbounded_sequence_float_field() + << eprosima::fastcdr::MemberId(69) << data.unbounded_sequence_double_field() + << eprosima::fastcdr::MemberId(70) << data.unbounded_sequence_bool_field() + << eprosima::fastcdr::MemberId(71) << data.unbounded_sequence_enum_field() + << eprosima::fastcdr::MemberId(72) << data.unbounded_sequence_enum2_field() + << eprosima::fastcdr::MemberId(73) << data.unbounded_sequence_struct_field() ; scdr.end_serialize_type(current_state); } @@ -1557,242 +1581,246 @@ eProsima_user_DllExport void deserialize( break; case 13: - dcdr >> data.enum_field(); + dcdr >> data.fixed_string_field(); break; case 14: - dcdr >> data.enum2_field(); + dcdr >> data.enum_field(); break; case 15: - dcdr >> data.struct_field(); + dcdr >> data.enum2_field(); break; case 16: - dcdr >> data.char_opt_field(); + dcdr >> data.struct_field(); break; case 17: - dcdr >> data.uint8_opt_field(); + dcdr >> data.char_opt_field(); break; case 18: - dcdr >> data.int16_opt_field(); + dcdr >> data.uint8_opt_field(); break; case 19: - dcdr >> data.uint16_opt_field(); + dcdr >> data.int16_opt_field(); break; case 20: - dcdr >> data.int32_opt_field(); + dcdr >> data.uint16_opt_field(); break; case 21: - dcdr >> data.uint32_opt_field(); + dcdr >> data.int32_opt_field(); break; case 22: - dcdr >> data.int64_opt_field(); + dcdr >> data.uint32_opt_field(); break; case 23: - dcdr >> data.uint64_opt_field(); + dcdr >> data.int64_opt_field(); break; case 24: - dcdr >> data.float_opt_field(); + dcdr >> data.uint64_opt_field(); break; case 25: - dcdr >> data.double_opt_field(); + dcdr >> data.float_opt_field(); break; case 26: - dcdr >> data.bool_opt_field(); + dcdr >> data.double_opt_field(); break; case 27: - dcdr >> data.string_opt_field(); + dcdr >> data.bool_opt_field(); break; case 28: - dcdr >> data.enum_opt_field(); + dcdr >> data.string_opt_field(); break; case 29: - dcdr >> data.enum2_opt_field(); + dcdr >> data.enum_opt_field(); break; case 30: - dcdr >> data.struct_opt_field(); + dcdr >> data.enum2_opt_field(); break; case 31: - dcdr >> data.array_char_field(); + dcdr >> data.struct_opt_field(); break; case 32: - dcdr >> data.array_uint8_field(); + dcdr >> data.array_char_field(); break; case 33: - dcdr >> data.array_int16_field(); + dcdr >> data.array_uint8_field(); break; case 34: - dcdr >> data.array_uint16_field(); + dcdr >> data.array_int16_field(); break; case 35: - dcdr >> data.array_int32_field(); + dcdr >> data.array_uint16_field(); break; case 36: - dcdr >> data.array_uint32_field(); + dcdr >> data.array_int32_field(); break; case 37: - dcdr >> data.array_int64_field(); + dcdr >> data.array_uint32_field(); break; case 38: - dcdr >> data.array_uint64_field(); + dcdr >> data.array_int64_field(); break; case 39: - dcdr >> data.array_float_field(); + dcdr >> data.array_uint64_field(); break; case 40: - dcdr >> data.array_double_field(); + dcdr >> data.array_float_field(); break; case 41: - dcdr >> data.array_bool_field(); + dcdr >> data.array_double_field(); break; case 42: - dcdr >> data.array_enum_field(); + dcdr >> data.array_bool_field(); break; case 43: - dcdr >> data.array_enum2_field(); + dcdr >> data.array_enum_field(); break; case 44: - dcdr >> data.array_struct_field(); + dcdr >> data.array_enum2_field(); break; case 45: - dcdr >> data.bounded_sequence_char_field(); + dcdr >> data.array_struct_field(); break; case 46: - dcdr >> data.bounded_sequence_uint8_field(); + dcdr >> data.bounded_sequence_char_field(); break; case 47: - dcdr >> data.bounded_sequence_int16_field(); + dcdr >> data.bounded_sequence_uint8_field(); break; case 48: - dcdr >> data.bounded_sequence_uint16_field(); + dcdr >> data.bounded_sequence_int16_field(); break; case 49: - dcdr >> data.bounded_sequence_int32_field(); + dcdr >> data.bounded_sequence_uint16_field(); break; case 50: - dcdr >> data.bounded_sequence_uint32_field(); + dcdr >> data.bounded_sequence_int32_field(); break; case 51: - dcdr >> data.bounded_sequence_int64_field(); + dcdr >> data.bounded_sequence_uint32_field(); break; case 52: - dcdr >> data.bounded_sequence_uint64_field(); + dcdr >> data.bounded_sequence_int64_field(); break; case 53: - dcdr >> data.bounded_sequence_float_field(); + dcdr >> data.bounded_sequence_uint64_field(); break; case 54: - dcdr >> data.bounded_sequence_double_field(); + dcdr >> data.bounded_sequence_float_field(); break; case 55: - dcdr >> data.bounded_sequence_bool_field(); + dcdr >> data.bounded_sequence_double_field(); break; case 56: - dcdr >> data.bounded_sequence_enum_field(); + dcdr >> data.bounded_sequence_bool_field(); break; case 57: - dcdr >> data.bounded_sequence_enum2_field(); + dcdr >> data.bounded_sequence_enum_field(); break; case 58: - dcdr >> data.bounded_sequence_struct_field(); + dcdr >> data.bounded_sequence_enum2_field(); break; case 59: - dcdr >> data.unbounded_sequence_char_field(); + dcdr >> data.bounded_sequence_struct_field(); break; case 60: - dcdr >> data.unbounded_sequence_uint8_field(); + dcdr >> data.unbounded_sequence_char_field(); break; case 61: - dcdr >> data.unbounded_sequence_int16_field(); + dcdr >> data.unbounded_sequence_uint8_field(); break; case 62: - dcdr >> data.unbounded_sequence_uint16_field(); + dcdr >> data.unbounded_sequence_int16_field(); break; case 63: - dcdr >> data.unbounded_sequence_int32_field(); + dcdr >> data.unbounded_sequence_uint16_field(); break; case 64: - dcdr >> data.unbounded_sequence_uint32_field(); + dcdr >> data.unbounded_sequence_int32_field(); break; case 65: - dcdr >> data.unbounded_sequence_int64_field(); + dcdr >> data.unbounded_sequence_uint32_field(); break; case 66: - dcdr >> data.unbounded_sequence_uint64_field(); + dcdr >> data.unbounded_sequence_int64_field(); break; case 67: - dcdr >> data.unbounded_sequence_float_field(); + dcdr >> data.unbounded_sequence_uint64_field(); break; case 68: - dcdr >> data.unbounded_sequence_double_field(); + dcdr >> data.unbounded_sequence_float_field(); break; case 69: - dcdr >> data.unbounded_sequence_bool_field(); + dcdr >> data.unbounded_sequence_double_field(); break; case 70: - dcdr >> data.unbounded_sequence_enum_field(); + dcdr >> data.unbounded_sequence_bool_field(); break; case 71: - dcdr >> data.unbounded_sequence_enum2_field(); + dcdr >> data.unbounded_sequence_enum_field(); break; case 72: + dcdr >> data.unbounded_sequence_enum2_field(); + break; + + case 73: dcdr >> data.unbounded_sequence_struct_field(); break; @@ -1948,6 +1976,7 @@ void serialize_key( + } diff --git a/fastdds_python/test/types/test_modulesTypeObjectSupport.cxx b/fastdds_python/test/types/test_modulesTypeObjectSupport.cxx index b5ccadb5..a3d8a4ef 100644 --- a/fastdds_python/test/types/test_modulesTypeObjectSupport.cxx +++ b/fastdds_python/test/types/test_modulesTypeObjectSupport.cxx @@ -582,6 +582,44 @@ void register_StructType_type_identifier( CompleteStructMember member_string_field = TypeObjectUtils::build_complete_struct_member(common_string_field, detail_string_field); TypeObjectUtils::add_complete_struct_member(member_seq_StructType, member_string_field); } + { + TypeIdentifierPair type_ids_fixed_string_field; + ReturnCode_t return_code_fixed_string_field {eprosima::fastdds::dds::RETCODE_OK}; + return_code_fixed_string_field = + eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( + "anonymous_string_16", type_ids_fixed_string_field); + + if (eprosima::fastdds::dds::RETCODE_OK != return_code_fixed_string_field) + { + { + SBound bound = static_cast(16); + StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound); + if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == + TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn, + "anonymous_string_16", type_ids_fixed_string_field)) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, + "anonymous_string_16 already registered in TypeObjectRegistry for a different type."); + } + } + } + StructMemberFlag member_flags_fixed_string_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, + false, false, false, false); + MemberId member_id_fixed_string_field = 0x0000000c; + bool common_fixed_string_field_ec {false}; + CommonStructMember common_fixed_string_field {TypeObjectUtils::build_common_struct_member(member_id_fixed_string_field, member_flags_fixed_string_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_fixed_string_field, common_fixed_string_field_ec))}; + if (!common_fixed_string_field_ec) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure fixed_string_field member TypeIdentifier inconsistent."); + return; + } + MemberName name_fixed_string_field = "fixed_string_field"; + eprosima::fastcdr::optional member_ann_builtin_fixed_string_field; + ann_custom_StructType.reset(); + CompleteMemberDetail detail_fixed_string_field = TypeObjectUtils::build_complete_member_detail(name_fixed_string_field, member_ann_builtin_fixed_string_field, ann_custom_StructType); + CompleteStructMember member_fixed_string_field = TypeObjectUtils::build_complete_struct_member(common_fixed_string_field, detail_fixed_string_field); + TypeObjectUtils::add_complete_struct_member(member_seq_StructType, member_fixed_string_field); + } { TypeIdentifierPair type_ids_enum_field; ReturnCode_t return_code_enum_field {eprosima::fastdds::dds::RETCODE_OK}; @@ -595,7 +633,7 @@ void register_StructType_type_identifier( } StructMemberFlag member_flags_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum_field = 0x0000000c; + MemberId member_id_enum_field = 0x0000000d; bool common_enum_field_ec {false}; CommonStructMember common_enum_field {TypeObjectUtils::build_common_struct_member(member_id_enum_field, member_flags_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_field, common_enum_field_ec))}; if (!common_enum_field_ec) @@ -623,7 +661,7 @@ void register_StructType_type_identifier( } StructMemberFlag member_flags_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum2_field = 0x0000000d; + MemberId member_id_enum2_field = 0x0000000e; bool common_enum2_field_ec {false}; CommonStructMember common_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_field, member_flags_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_field, common_enum2_field_ec))}; if (!common_enum2_field_ec) @@ -1035,6 +1073,44 @@ void register_CompleteTestType_type_identifier( CompleteStructMember member_string_field = TypeObjectUtils::build_complete_struct_member(common_string_field, detail_string_field); TypeObjectUtils::add_complete_struct_member(member_seq_CompleteTestType, member_string_field); } + { + TypeIdentifierPair type_ids_fixed_string_field; + ReturnCode_t return_code_fixed_string_field {eprosima::fastdds::dds::RETCODE_OK}; + return_code_fixed_string_field = + eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( + "anonymous_string_16", type_ids_fixed_string_field); + + if (eprosima::fastdds::dds::RETCODE_OK != return_code_fixed_string_field) + { + { + SBound bound = static_cast(16); + StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound); + if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == + TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn, + "anonymous_string_16", type_ids_fixed_string_field)) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, + "anonymous_string_16 already registered in TypeObjectRegistry for a different type."); + } + } + } + StructMemberFlag member_flags_fixed_string_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, + false, false, false, false); + MemberId member_id_fixed_string_field = 0x0000000c; + bool common_fixed_string_field_ec {false}; + CommonStructMember common_fixed_string_field {TypeObjectUtils::build_common_struct_member(member_id_fixed_string_field, member_flags_fixed_string_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_fixed_string_field, common_fixed_string_field_ec))}; + if (!common_fixed_string_field_ec) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure fixed_string_field member TypeIdentifier inconsistent."); + return; + } + MemberName name_fixed_string_field = "fixed_string_field"; + eprosima::fastcdr::optional member_ann_builtin_fixed_string_field; + ann_custom_CompleteTestType.reset(); + CompleteMemberDetail detail_fixed_string_field = TypeObjectUtils::build_complete_member_detail(name_fixed_string_field, member_ann_builtin_fixed_string_field, ann_custom_CompleteTestType); + CompleteStructMember member_fixed_string_field = TypeObjectUtils::build_complete_struct_member(common_fixed_string_field, detail_fixed_string_field); + TypeObjectUtils::add_complete_struct_member(member_seq_CompleteTestType, member_fixed_string_field); + } { TypeIdentifierPair type_ids_enum_field; ReturnCode_t return_code_enum_field {eprosima::fastdds::dds::RETCODE_OK}; @@ -1048,7 +1124,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum_field = 0x0000000c; + MemberId member_id_enum_field = 0x0000000d; bool common_enum_field_ec {false}; CommonStructMember common_enum_field {TypeObjectUtils::build_common_struct_member(member_id_enum_field, member_flags_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_field, common_enum_field_ec))}; if (!common_enum_field_ec) @@ -1076,7 +1152,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum2_field = 0x0000000d; + MemberId member_id_enum2_field = 0x0000000e; bool common_enum2_field_ec {false}; CommonStructMember common_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_field, member_flags_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_field, common_enum2_field_ec))}; if (!common_enum2_field_ec) @@ -1104,7 +1180,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_struct_field = 0x0000000e; + MemberId member_id_struct_field = 0x0000000f; bool common_struct_field_ec {false}; CommonStructMember common_struct_field {TypeObjectUtils::build_common_struct_member(member_id_struct_field, member_flags_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_struct_field, common_struct_field_ec))}; if (!common_struct_field_ec) @@ -1134,7 +1210,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_char_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_char_opt_field = 0x0000000f; + MemberId member_id_char_opt_field = 0x00000010; bool common_char_opt_field_ec {false}; CommonStructMember common_char_opt_field {TypeObjectUtils::build_common_struct_member(member_id_char_opt_field, member_flags_char_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_char_opt_field, common_char_opt_field_ec))}; if (!common_char_opt_field_ec) @@ -1177,7 +1253,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_uint8_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint8_opt_field = 0x00000010; + MemberId member_id_uint8_opt_field = 0x00000011; bool common_uint8_opt_field_ec {false}; CommonStructMember common_uint8_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint8_opt_field, member_flags_uint8_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint8_opt_field, common_uint8_opt_field_ec))}; if (!common_uint8_opt_field_ec) @@ -1220,7 +1296,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_int16_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int16_opt_field = 0x00000011; + MemberId member_id_int16_opt_field = 0x00000012; bool common_int16_opt_field_ec {false}; CommonStructMember common_int16_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int16_opt_field, member_flags_int16_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int16_opt_field, common_int16_opt_field_ec))}; if (!common_int16_opt_field_ec) @@ -1263,7 +1339,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_uint16_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint16_opt_field = 0x00000012; + MemberId member_id_uint16_opt_field = 0x00000013; bool common_uint16_opt_field_ec {false}; CommonStructMember common_uint16_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint16_opt_field, member_flags_uint16_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint16_opt_field, common_uint16_opt_field_ec))}; if (!common_uint16_opt_field_ec) @@ -1306,7 +1382,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_int32_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int32_opt_field = 0x00000013; + MemberId member_id_int32_opt_field = 0x00000014; bool common_int32_opt_field_ec {false}; CommonStructMember common_int32_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int32_opt_field, member_flags_int32_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int32_opt_field, common_int32_opt_field_ec))}; if (!common_int32_opt_field_ec) @@ -1349,7 +1425,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_uint32_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint32_opt_field = 0x00000014; + MemberId member_id_uint32_opt_field = 0x00000015; bool common_uint32_opt_field_ec {false}; CommonStructMember common_uint32_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint32_opt_field, member_flags_uint32_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint32_opt_field, common_uint32_opt_field_ec))}; if (!common_uint32_opt_field_ec) @@ -1392,7 +1468,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_int64_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int64_opt_field = 0x00000015; + MemberId member_id_int64_opt_field = 0x00000016; bool common_int64_opt_field_ec {false}; CommonStructMember common_int64_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int64_opt_field, member_flags_int64_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int64_opt_field, common_int64_opt_field_ec))}; if (!common_int64_opt_field_ec) @@ -1435,7 +1511,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_uint64_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint64_opt_field = 0x00000016; + MemberId member_id_uint64_opt_field = 0x00000017; bool common_uint64_opt_field_ec {false}; CommonStructMember common_uint64_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint64_opt_field, member_flags_uint64_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint64_opt_field, common_uint64_opt_field_ec))}; if (!common_uint64_opt_field_ec) @@ -1478,7 +1554,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_float_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_float_opt_field = 0x00000017; + MemberId member_id_float_opt_field = 0x00000018; bool common_float_opt_field_ec {false}; CommonStructMember common_float_opt_field {TypeObjectUtils::build_common_struct_member(member_id_float_opt_field, member_flags_float_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_float_opt_field, common_float_opt_field_ec))}; if (!common_float_opt_field_ec) @@ -1521,7 +1597,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_double_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_double_opt_field = 0x00000018; + MemberId member_id_double_opt_field = 0x00000019; bool common_double_opt_field_ec {false}; CommonStructMember common_double_opt_field {TypeObjectUtils::build_common_struct_member(member_id_double_opt_field, member_flags_double_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_double_opt_field, common_double_opt_field_ec))}; if (!common_double_opt_field_ec) @@ -1564,7 +1640,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bool_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_bool_opt_field = 0x00000019; + MemberId member_id_bool_opt_field = 0x0000001a; bool common_bool_opt_field_ec {false}; CommonStructMember common_bool_opt_field {TypeObjectUtils::build_common_struct_member(member_id_bool_opt_field, member_flags_bool_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bool_opt_field, common_bool_opt_field_ec))}; if (!common_bool_opt_field_ec) @@ -1615,7 +1691,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_string_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_string_opt_field = 0x0000001a; + MemberId member_id_string_opt_field = 0x0000001b; bool common_string_opt_field_ec {false}; CommonStructMember common_string_opt_field {TypeObjectUtils::build_common_struct_member(member_id_string_opt_field, member_flags_string_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_string_opt_field, common_string_opt_field_ec))}; if (!common_string_opt_field_ec) @@ -1656,7 +1732,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_enum_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum_opt_field = 0x0000001b; + MemberId member_id_enum_opt_field = 0x0000001c; bool common_enum_opt_field_ec {false}; CommonStructMember common_enum_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum_opt_field, member_flags_enum_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_opt_field, common_enum_opt_field_ec))}; if (!common_enum_opt_field_ec) @@ -1697,7 +1773,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_enum2_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum2_opt_field = 0x0000001c; + MemberId member_id_enum2_opt_field = 0x0000001d; bool common_enum2_opt_field_ec {false}; CommonStructMember common_enum2_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_opt_field, member_flags_enum2_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_opt_field, common_enum2_opt_field_ec))}; if (!common_enum2_opt_field_ec) @@ -1738,7 +1814,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_struct_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_struct_opt_field = 0x0000001d; + MemberId member_id_struct_opt_field = 0x0000001e; bool common_struct_opt_field_ec {false}; CommonStructMember common_struct_opt_field {TypeObjectUtils::build_common_struct_member(member_id_struct_opt_field, member_flags_struct_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_struct_opt_field, common_struct_opt_field_ec))}; if (!common_struct_opt_field_ec) @@ -1815,7 +1891,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_char_field = 0x0000001e; + MemberId member_id_array_char_field = 0x0000001f; bool common_array_char_field_ec {false}; CommonStructMember common_array_char_field {TypeObjectUtils::build_common_struct_member(member_id_array_char_field, member_flags_array_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_char_field, common_array_char_field_ec))}; if (!common_array_char_field_ec) @@ -1879,7 +1955,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint8_field = 0x0000001f; + MemberId member_id_array_uint8_field = 0x00000020; bool common_array_uint8_field_ec {false}; CommonStructMember common_array_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint8_field, member_flags_array_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint8_field, common_array_uint8_field_ec))}; if (!common_array_uint8_field_ec) @@ -1943,7 +2019,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int16_field = 0x00000020; + MemberId member_id_array_int16_field = 0x00000021; bool common_array_int16_field_ec {false}; CommonStructMember common_array_int16_field {TypeObjectUtils::build_common_struct_member(member_id_array_int16_field, member_flags_array_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int16_field, common_array_int16_field_ec))}; if (!common_array_int16_field_ec) @@ -2007,7 +2083,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint16_field = 0x00000021; + MemberId member_id_array_uint16_field = 0x00000022; bool common_array_uint16_field_ec {false}; CommonStructMember common_array_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint16_field, member_flags_array_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint16_field, common_array_uint16_field_ec))}; if (!common_array_uint16_field_ec) @@ -2071,7 +2147,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int32_field = 0x00000022; + MemberId member_id_array_int32_field = 0x00000023; bool common_array_int32_field_ec {false}; CommonStructMember common_array_int32_field {TypeObjectUtils::build_common_struct_member(member_id_array_int32_field, member_flags_array_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int32_field, common_array_int32_field_ec))}; if (!common_array_int32_field_ec) @@ -2135,7 +2211,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint32_field = 0x00000023; + MemberId member_id_array_uint32_field = 0x00000024; bool common_array_uint32_field_ec {false}; CommonStructMember common_array_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint32_field, member_flags_array_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint32_field, common_array_uint32_field_ec))}; if (!common_array_uint32_field_ec) @@ -2199,7 +2275,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int64_field = 0x00000024; + MemberId member_id_array_int64_field = 0x00000025; bool common_array_int64_field_ec {false}; CommonStructMember common_array_int64_field {TypeObjectUtils::build_common_struct_member(member_id_array_int64_field, member_flags_array_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int64_field, common_array_int64_field_ec))}; if (!common_array_int64_field_ec) @@ -2263,7 +2339,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint64_field = 0x00000025; + MemberId member_id_array_uint64_field = 0x00000026; bool common_array_uint64_field_ec {false}; CommonStructMember common_array_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint64_field, member_flags_array_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint64_field, common_array_uint64_field_ec))}; if (!common_array_uint64_field_ec) @@ -2327,7 +2403,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_float_field = 0x00000026; + MemberId member_id_array_float_field = 0x00000027; bool common_array_float_field_ec {false}; CommonStructMember common_array_float_field {TypeObjectUtils::build_common_struct_member(member_id_array_float_field, member_flags_array_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_float_field, common_array_float_field_ec))}; if (!common_array_float_field_ec) @@ -2391,7 +2467,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_double_field = 0x00000027; + MemberId member_id_array_double_field = 0x00000028; bool common_array_double_field_ec {false}; CommonStructMember common_array_double_field {TypeObjectUtils::build_common_struct_member(member_id_array_double_field, member_flags_array_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_double_field, common_array_double_field_ec))}; if (!common_array_double_field_ec) @@ -2455,7 +2531,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_bool_field = 0x00000028; + MemberId member_id_array_bool_field = 0x00000029; bool common_array_bool_field_ec {false}; CommonStructMember common_array_bool_field {TypeObjectUtils::build_common_struct_member(member_id_array_bool_field, member_flags_array_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_bool_field, common_array_bool_field_ec))}; if (!common_array_bool_field_ec) @@ -2517,7 +2593,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum_field = 0x00000029; + MemberId member_id_array_enum_field = 0x0000002a; bool common_array_enum_field_ec {false}; CommonStructMember common_array_enum_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum_field, member_flags_array_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum_field, common_array_enum_field_ec))}; if (!common_array_enum_field_ec) @@ -2579,7 +2655,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum2_field = 0x0000002a; + MemberId member_id_array_enum2_field = 0x0000002b; bool common_array_enum2_field_ec {false}; CommonStructMember common_array_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum2_field, member_flags_array_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum2_field, common_array_enum2_field_ec))}; if (!common_array_enum2_field_ec) @@ -2641,7 +2717,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_array_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_struct_field = 0x0000002b; + MemberId member_id_array_struct_field = 0x0000002c; bool common_array_struct_field_ec {false}; CommonStructMember common_array_struct_field {TypeObjectUtils::build_common_struct_member(member_id_array_struct_field, member_flags_array_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_struct_field, common_array_struct_field_ec))}; if (!common_array_struct_field_ec) @@ -2703,7 +2779,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_char_field = 0x0000002c; + MemberId member_id_bounded_sequence_char_field = 0x0000002d; bool common_bounded_sequence_char_field_ec {false}; CommonStructMember common_bounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_char_field, member_flags_bounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_char_field, common_bounded_sequence_char_field_ec))}; if (!common_bounded_sequence_char_field_ec) @@ -2765,7 +2841,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint8_field = 0x0000002d; + MemberId member_id_bounded_sequence_uint8_field = 0x0000002e; bool common_bounded_sequence_uint8_field_ec {false}; CommonStructMember common_bounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint8_field, member_flags_bounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint8_field, common_bounded_sequence_uint8_field_ec))}; if (!common_bounded_sequence_uint8_field_ec) @@ -2827,7 +2903,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int16_field = 0x0000002e; + MemberId member_id_bounded_sequence_int16_field = 0x0000002f; bool common_bounded_sequence_int16_field_ec {false}; CommonStructMember common_bounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int16_field, member_flags_bounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int16_field, common_bounded_sequence_int16_field_ec))}; if (!common_bounded_sequence_int16_field_ec) @@ -2889,7 +2965,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint16_field = 0x0000002f; + MemberId member_id_bounded_sequence_uint16_field = 0x00000030; bool common_bounded_sequence_uint16_field_ec {false}; CommonStructMember common_bounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint16_field, member_flags_bounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint16_field, common_bounded_sequence_uint16_field_ec))}; if (!common_bounded_sequence_uint16_field_ec) @@ -2951,7 +3027,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int32_field = 0x00000030; + MemberId member_id_bounded_sequence_int32_field = 0x00000031; bool common_bounded_sequence_int32_field_ec {false}; CommonStructMember common_bounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int32_field, member_flags_bounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int32_field, common_bounded_sequence_int32_field_ec))}; if (!common_bounded_sequence_int32_field_ec) @@ -3013,7 +3089,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint32_field = 0x00000031; + MemberId member_id_bounded_sequence_uint32_field = 0x00000032; bool common_bounded_sequence_uint32_field_ec {false}; CommonStructMember common_bounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint32_field, member_flags_bounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint32_field, common_bounded_sequence_uint32_field_ec))}; if (!common_bounded_sequence_uint32_field_ec) @@ -3075,7 +3151,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int64_field = 0x00000032; + MemberId member_id_bounded_sequence_int64_field = 0x00000033; bool common_bounded_sequence_int64_field_ec {false}; CommonStructMember common_bounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int64_field, member_flags_bounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int64_field, common_bounded_sequence_int64_field_ec))}; if (!common_bounded_sequence_int64_field_ec) @@ -3137,7 +3213,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint64_field = 0x00000033; + MemberId member_id_bounded_sequence_uint64_field = 0x00000034; bool common_bounded_sequence_uint64_field_ec {false}; CommonStructMember common_bounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint64_field, member_flags_bounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint64_field, common_bounded_sequence_uint64_field_ec))}; if (!common_bounded_sequence_uint64_field_ec) @@ -3199,7 +3275,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_float_field = 0x00000034; + MemberId member_id_bounded_sequence_float_field = 0x00000035; bool common_bounded_sequence_float_field_ec {false}; CommonStructMember common_bounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_float_field, member_flags_bounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_float_field, common_bounded_sequence_float_field_ec))}; if (!common_bounded_sequence_float_field_ec) @@ -3261,7 +3337,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_double_field = 0x00000035; + MemberId member_id_bounded_sequence_double_field = 0x00000036; bool common_bounded_sequence_double_field_ec {false}; CommonStructMember common_bounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_double_field, member_flags_bounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_double_field, common_bounded_sequence_double_field_ec))}; if (!common_bounded_sequence_double_field_ec) @@ -3323,7 +3399,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_bool_field = 0x00000036; + MemberId member_id_bounded_sequence_bool_field = 0x00000037; bool common_bounded_sequence_bool_field_ec {false}; CommonStructMember common_bounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_bool_field, member_flags_bounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_bool_field, common_bounded_sequence_bool_field_ec))}; if (!common_bounded_sequence_bool_field_ec) @@ -3383,7 +3459,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum_field = 0x00000037; + MemberId member_id_bounded_sequence_enum_field = 0x00000038; bool common_bounded_sequence_enum_field_ec {false}; CommonStructMember common_bounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum_field, member_flags_bounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum_field, common_bounded_sequence_enum_field_ec))}; if (!common_bounded_sequence_enum_field_ec) @@ -3443,7 +3519,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum2_field = 0x00000038; + MemberId member_id_bounded_sequence_enum2_field = 0x00000039; bool common_bounded_sequence_enum2_field_ec {false}; CommonStructMember common_bounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum2_field, member_flags_bounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum2_field, common_bounded_sequence_enum2_field_ec))}; if (!common_bounded_sequence_enum2_field_ec) @@ -3503,7 +3579,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_struct_field = 0x00000039; + MemberId member_id_bounded_sequence_struct_field = 0x0000003a; bool common_bounded_sequence_struct_field_ec {false}; CommonStructMember common_bounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_struct_field, member_flags_bounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_struct_field, common_bounded_sequence_struct_field_ec))}; if (!common_bounded_sequence_struct_field_ec) @@ -3565,7 +3641,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_char_field = 0x0000003a; + MemberId member_id_unbounded_sequence_char_field = 0x0000003b; bool common_unbounded_sequence_char_field_ec {false}; CommonStructMember common_unbounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_char_field, member_flags_unbounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_char_field, common_unbounded_sequence_char_field_ec))}; if (!common_unbounded_sequence_char_field_ec) @@ -3627,7 +3703,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint8_field = 0x0000003b; + MemberId member_id_unbounded_sequence_uint8_field = 0x0000003c; bool common_unbounded_sequence_uint8_field_ec {false}; CommonStructMember common_unbounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint8_field, member_flags_unbounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint8_field, common_unbounded_sequence_uint8_field_ec))}; if (!common_unbounded_sequence_uint8_field_ec) @@ -3689,7 +3765,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int16_field = 0x0000003c; + MemberId member_id_unbounded_sequence_int16_field = 0x0000003d; bool common_unbounded_sequence_int16_field_ec {false}; CommonStructMember common_unbounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int16_field, member_flags_unbounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int16_field, common_unbounded_sequence_int16_field_ec))}; if (!common_unbounded_sequence_int16_field_ec) @@ -3751,7 +3827,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint16_field = 0x0000003d; + MemberId member_id_unbounded_sequence_uint16_field = 0x0000003e; bool common_unbounded_sequence_uint16_field_ec {false}; CommonStructMember common_unbounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint16_field, member_flags_unbounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint16_field, common_unbounded_sequence_uint16_field_ec))}; if (!common_unbounded_sequence_uint16_field_ec) @@ -3813,7 +3889,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int32_field = 0x0000003e; + MemberId member_id_unbounded_sequence_int32_field = 0x0000003f; bool common_unbounded_sequence_int32_field_ec {false}; CommonStructMember common_unbounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int32_field, member_flags_unbounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int32_field, common_unbounded_sequence_int32_field_ec))}; if (!common_unbounded_sequence_int32_field_ec) @@ -3875,7 +3951,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint32_field = 0x0000003f; + MemberId member_id_unbounded_sequence_uint32_field = 0x00000040; bool common_unbounded_sequence_uint32_field_ec {false}; CommonStructMember common_unbounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint32_field, member_flags_unbounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint32_field, common_unbounded_sequence_uint32_field_ec))}; if (!common_unbounded_sequence_uint32_field_ec) @@ -3937,7 +4013,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int64_field = 0x00000040; + MemberId member_id_unbounded_sequence_int64_field = 0x00000041; bool common_unbounded_sequence_int64_field_ec {false}; CommonStructMember common_unbounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int64_field, member_flags_unbounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int64_field, common_unbounded_sequence_int64_field_ec))}; if (!common_unbounded_sequence_int64_field_ec) @@ -3999,7 +4075,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint64_field = 0x00000041; + MemberId member_id_unbounded_sequence_uint64_field = 0x00000042; bool common_unbounded_sequence_uint64_field_ec {false}; CommonStructMember common_unbounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint64_field, member_flags_unbounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint64_field, common_unbounded_sequence_uint64_field_ec))}; if (!common_unbounded_sequence_uint64_field_ec) @@ -4061,7 +4137,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_float_field = 0x00000042; + MemberId member_id_unbounded_sequence_float_field = 0x00000043; bool common_unbounded_sequence_float_field_ec {false}; CommonStructMember common_unbounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_float_field, member_flags_unbounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_float_field, common_unbounded_sequence_float_field_ec))}; if (!common_unbounded_sequence_float_field_ec) @@ -4123,7 +4199,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_double_field = 0x00000043; + MemberId member_id_unbounded_sequence_double_field = 0x00000044; bool common_unbounded_sequence_double_field_ec {false}; CommonStructMember common_unbounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_double_field, member_flags_unbounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_double_field, common_unbounded_sequence_double_field_ec))}; if (!common_unbounded_sequence_double_field_ec) @@ -4185,7 +4261,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_bool_field = 0x00000044; + MemberId member_id_unbounded_sequence_bool_field = 0x00000045; bool common_unbounded_sequence_bool_field_ec {false}; CommonStructMember common_unbounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_bool_field, member_flags_unbounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_bool_field, common_unbounded_sequence_bool_field_ec))}; if (!common_unbounded_sequence_bool_field_ec) @@ -4245,7 +4321,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum_field = 0x00000045; + MemberId member_id_unbounded_sequence_enum_field = 0x00000046; bool common_unbounded_sequence_enum_field_ec {false}; CommonStructMember common_unbounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum_field, member_flags_unbounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum_field, common_unbounded_sequence_enum_field_ec))}; if (!common_unbounded_sequence_enum_field_ec) @@ -4305,7 +4381,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum2_field = 0x00000046; + MemberId member_id_unbounded_sequence_enum2_field = 0x00000047; bool common_unbounded_sequence_enum2_field_ec {false}; CommonStructMember common_unbounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum2_field, member_flags_unbounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum2_field, common_unbounded_sequence_enum2_field_ec))}; if (!common_unbounded_sequence_enum2_field_ec) @@ -4365,7 +4441,7 @@ void register_CompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_struct_field = 0x00000047; + MemberId member_id_unbounded_sequence_struct_field = 0x00000048; bool common_unbounded_sequence_struct_field_ec {false}; CommonStructMember common_unbounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_struct_field, member_flags_unbounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_struct_field, common_unbounded_sequence_struct_field_ec))}; if (!common_unbounded_sequence_struct_field_ec) @@ -4820,6 +4896,44 @@ void register_KeyedCompleteTestType_type_identifier( CompleteStructMember member_string_field = TypeObjectUtils::build_complete_struct_member(common_string_field, detail_string_field); TypeObjectUtils::add_complete_struct_member(member_seq_KeyedCompleteTestType, member_string_field); } + { + TypeIdentifierPair type_ids_fixed_string_field; + ReturnCode_t return_code_fixed_string_field {eprosima::fastdds::dds::RETCODE_OK}; + return_code_fixed_string_field = + eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers( + "anonymous_string_16", type_ids_fixed_string_field); + + if (eprosima::fastdds::dds::RETCODE_OK != return_code_fixed_string_field) + { + { + SBound bound = static_cast(16); + StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound); + if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER == + TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn, + "anonymous_string_16", type_ids_fixed_string_field)) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, + "anonymous_string_16 already registered in TypeObjectRegistry for a different type."); + } + } + } + StructMemberFlag member_flags_fixed_string_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, + false, false, false, false); + MemberId member_id_fixed_string_field = 0x0000000d; + bool common_fixed_string_field_ec {false}; + CommonStructMember common_fixed_string_field {TypeObjectUtils::build_common_struct_member(member_id_fixed_string_field, member_flags_fixed_string_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_fixed_string_field, common_fixed_string_field_ec))}; + if (!common_fixed_string_field_ec) + { + EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure fixed_string_field member TypeIdentifier inconsistent."); + return; + } + MemberName name_fixed_string_field = "fixed_string_field"; + eprosima::fastcdr::optional member_ann_builtin_fixed_string_field; + ann_custom_KeyedCompleteTestType.reset(); + CompleteMemberDetail detail_fixed_string_field = TypeObjectUtils::build_complete_member_detail(name_fixed_string_field, member_ann_builtin_fixed_string_field, ann_custom_KeyedCompleteTestType); + CompleteStructMember member_fixed_string_field = TypeObjectUtils::build_complete_struct_member(common_fixed_string_field, detail_fixed_string_field); + TypeObjectUtils::add_complete_struct_member(member_seq_KeyedCompleteTestType, member_fixed_string_field); + } { TypeIdentifierPair type_ids_enum_field; ReturnCode_t return_code_enum_field {eprosima::fastdds::dds::RETCODE_OK}; @@ -4833,7 +4947,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum_field = 0x0000000d; + MemberId member_id_enum_field = 0x0000000e; bool common_enum_field_ec {false}; CommonStructMember common_enum_field {TypeObjectUtils::build_common_struct_member(member_id_enum_field, member_flags_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_field, common_enum_field_ec))}; if (!common_enum_field_ec) @@ -4861,7 +4975,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_enum2_field = 0x0000000e; + MemberId member_id_enum2_field = 0x0000000f; bool common_enum2_field_ec {false}; CommonStructMember common_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_field, member_flags_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_field, common_enum2_field_ec))}; if (!common_enum2_field_ec) @@ -4889,7 +5003,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_struct_field = 0x0000000f; + MemberId member_id_struct_field = 0x00000010; bool common_struct_field_ec {false}; CommonStructMember common_struct_field {TypeObjectUtils::build_common_struct_member(member_id_struct_field, member_flags_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_struct_field, common_struct_field_ec))}; if (!common_struct_field_ec) @@ -4919,7 +5033,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_char_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_char_opt_field = 0x00000010; + MemberId member_id_char_opt_field = 0x00000011; bool common_char_opt_field_ec {false}; CommonStructMember common_char_opt_field {TypeObjectUtils::build_common_struct_member(member_id_char_opt_field, member_flags_char_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_char_opt_field, common_char_opt_field_ec))}; if (!common_char_opt_field_ec) @@ -4962,7 +5076,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_uint8_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint8_opt_field = 0x00000011; + MemberId member_id_uint8_opt_field = 0x00000012; bool common_uint8_opt_field_ec {false}; CommonStructMember common_uint8_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint8_opt_field, member_flags_uint8_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint8_opt_field, common_uint8_opt_field_ec))}; if (!common_uint8_opt_field_ec) @@ -5005,7 +5119,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_int16_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int16_opt_field = 0x00000012; + MemberId member_id_int16_opt_field = 0x00000013; bool common_int16_opt_field_ec {false}; CommonStructMember common_int16_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int16_opt_field, member_flags_int16_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int16_opt_field, common_int16_opt_field_ec))}; if (!common_int16_opt_field_ec) @@ -5048,7 +5162,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_uint16_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint16_opt_field = 0x00000013; + MemberId member_id_uint16_opt_field = 0x00000014; bool common_uint16_opt_field_ec {false}; CommonStructMember common_uint16_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint16_opt_field, member_flags_uint16_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint16_opt_field, common_uint16_opt_field_ec))}; if (!common_uint16_opt_field_ec) @@ -5091,7 +5205,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_int32_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int32_opt_field = 0x00000014; + MemberId member_id_int32_opt_field = 0x00000015; bool common_int32_opt_field_ec {false}; CommonStructMember common_int32_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int32_opt_field, member_flags_int32_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int32_opt_field, common_int32_opt_field_ec))}; if (!common_int32_opt_field_ec) @@ -5134,7 +5248,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_uint32_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint32_opt_field = 0x00000015; + MemberId member_id_uint32_opt_field = 0x00000016; bool common_uint32_opt_field_ec {false}; CommonStructMember common_uint32_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint32_opt_field, member_flags_uint32_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint32_opt_field, common_uint32_opt_field_ec))}; if (!common_uint32_opt_field_ec) @@ -5177,7 +5291,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_int64_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_int64_opt_field = 0x00000016; + MemberId member_id_int64_opt_field = 0x00000017; bool common_int64_opt_field_ec {false}; CommonStructMember common_int64_opt_field {TypeObjectUtils::build_common_struct_member(member_id_int64_opt_field, member_flags_int64_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_int64_opt_field, common_int64_opt_field_ec))}; if (!common_int64_opt_field_ec) @@ -5220,7 +5334,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_uint64_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_uint64_opt_field = 0x00000017; + MemberId member_id_uint64_opt_field = 0x00000018; bool common_uint64_opt_field_ec {false}; CommonStructMember common_uint64_opt_field {TypeObjectUtils::build_common_struct_member(member_id_uint64_opt_field, member_flags_uint64_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_uint64_opt_field, common_uint64_opt_field_ec))}; if (!common_uint64_opt_field_ec) @@ -5263,7 +5377,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_float_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_float_opt_field = 0x00000018; + MemberId member_id_float_opt_field = 0x00000019; bool common_float_opt_field_ec {false}; CommonStructMember common_float_opt_field {TypeObjectUtils::build_common_struct_member(member_id_float_opt_field, member_flags_float_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_float_opt_field, common_float_opt_field_ec))}; if (!common_float_opt_field_ec) @@ -5306,7 +5420,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_double_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_double_opt_field = 0x00000019; + MemberId member_id_double_opt_field = 0x0000001a; bool common_double_opt_field_ec {false}; CommonStructMember common_double_opt_field {TypeObjectUtils::build_common_struct_member(member_id_double_opt_field, member_flags_double_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_double_opt_field, common_double_opt_field_ec))}; if (!common_double_opt_field_ec) @@ -5349,7 +5463,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bool_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_bool_opt_field = 0x0000001a; + MemberId member_id_bool_opt_field = 0x0000001b; bool common_bool_opt_field_ec {false}; CommonStructMember common_bool_opt_field {TypeObjectUtils::build_common_struct_member(member_id_bool_opt_field, member_flags_bool_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bool_opt_field, common_bool_opt_field_ec))}; if (!common_bool_opt_field_ec) @@ -5400,7 +5514,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_string_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_string_opt_field = 0x0000001b; + MemberId member_id_string_opt_field = 0x0000001c; bool common_string_opt_field_ec {false}; CommonStructMember common_string_opt_field {TypeObjectUtils::build_common_struct_member(member_id_string_opt_field, member_flags_string_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_string_opt_field, common_string_opt_field_ec))}; if (!common_string_opt_field_ec) @@ -5441,7 +5555,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_enum_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum_opt_field = 0x0000001c; + MemberId member_id_enum_opt_field = 0x0000001d; bool common_enum_opt_field_ec {false}; CommonStructMember common_enum_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum_opt_field, member_flags_enum_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum_opt_field, common_enum_opt_field_ec))}; if (!common_enum_opt_field_ec) @@ -5482,7 +5596,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_enum2_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_enum2_opt_field = 0x0000001d; + MemberId member_id_enum2_opt_field = 0x0000001e; bool common_enum2_opt_field_ec {false}; CommonStructMember common_enum2_opt_field {TypeObjectUtils::build_common_struct_member(member_id_enum2_opt_field, member_flags_enum2_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_enum2_opt_field, common_enum2_opt_field_ec))}; if (!common_enum2_opt_field_ec) @@ -5523,7 +5637,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_struct_opt_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, true, false, false, false); - MemberId member_id_struct_opt_field = 0x0000001e; + MemberId member_id_struct_opt_field = 0x0000001f; bool common_struct_opt_field_ec {false}; CommonStructMember common_struct_opt_field {TypeObjectUtils::build_common_struct_member(member_id_struct_opt_field, member_flags_struct_opt_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_struct_opt_field, common_struct_opt_field_ec))}; if (!common_struct_opt_field_ec) @@ -5600,7 +5714,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_char_field = 0x0000001f; + MemberId member_id_array_char_field = 0x00000020; bool common_array_char_field_ec {false}; CommonStructMember common_array_char_field {TypeObjectUtils::build_common_struct_member(member_id_array_char_field, member_flags_array_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_char_field, common_array_char_field_ec))}; if (!common_array_char_field_ec) @@ -5664,7 +5778,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint8_field = 0x00000020; + MemberId member_id_array_uint8_field = 0x00000021; bool common_array_uint8_field_ec {false}; CommonStructMember common_array_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint8_field, member_flags_array_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint8_field, common_array_uint8_field_ec))}; if (!common_array_uint8_field_ec) @@ -5728,7 +5842,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int16_field = 0x00000021; + MemberId member_id_array_int16_field = 0x00000022; bool common_array_int16_field_ec {false}; CommonStructMember common_array_int16_field {TypeObjectUtils::build_common_struct_member(member_id_array_int16_field, member_flags_array_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int16_field, common_array_int16_field_ec))}; if (!common_array_int16_field_ec) @@ -5792,7 +5906,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint16_field = 0x00000022; + MemberId member_id_array_uint16_field = 0x00000023; bool common_array_uint16_field_ec {false}; CommonStructMember common_array_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint16_field, member_flags_array_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint16_field, common_array_uint16_field_ec))}; if (!common_array_uint16_field_ec) @@ -5856,7 +5970,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int32_field = 0x00000023; + MemberId member_id_array_int32_field = 0x00000024; bool common_array_int32_field_ec {false}; CommonStructMember common_array_int32_field {TypeObjectUtils::build_common_struct_member(member_id_array_int32_field, member_flags_array_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int32_field, common_array_int32_field_ec))}; if (!common_array_int32_field_ec) @@ -5920,7 +6034,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint32_field = 0x00000024; + MemberId member_id_array_uint32_field = 0x00000025; bool common_array_uint32_field_ec {false}; CommonStructMember common_array_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint32_field, member_flags_array_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint32_field, common_array_uint32_field_ec))}; if (!common_array_uint32_field_ec) @@ -5984,7 +6098,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_int64_field = 0x00000025; + MemberId member_id_array_int64_field = 0x00000026; bool common_array_int64_field_ec {false}; CommonStructMember common_array_int64_field {TypeObjectUtils::build_common_struct_member(member_id_array_int64_field, member_flags_array_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_int64_field, common_array_int64_field_ec))}; if (!common_array_int64_field_ec) @@ -6048,7 +6162,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_uint64_field = 0x00000026; + MemberId member_id_array_uint64_field = 0x00000027; bool common_array_uint64_field_ec {false}; CommonStructMember common_array_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_array_uint64_field, member_flags_array_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_uint64_field, common_array_uint64_field_ec))}; if (!common_array_uint64_field_ec) @@ -6112,7 +6226,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_float_field = 0x00000027; + MemberId member_id_array_float_field = 0x00000028; bool common_array_float_field_ec {false}; CommonStructMember common_array_float_field {TypeObjectUtils::build_common_struct_member(member_id_array_float_field, member_flags_array_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_float_field, common_array_float_field_ec))}; if (!common_array_float_field_ec) @@ -6176,7 +6290,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_double_field = 0x00000028; + MemberId member_id_array_double_field = 0x00000029; bool common_array_double_field_ec {false}; CommonStructMember common_array_double_field {TypeObjectUtils::build_common_struct_member(member_id_array_double_field, member_flags_array_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_double_field, common_array_double_field_ec))}; if (!common_array_double_field_ec) @@ -6240,7 +6354,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_bool_field = 0x00000029; + MemberId member_id_array_bool_field = 0x0000002a; bool common_array_bool_field_ec {false}; CommonStructMember common_array_bool_field {TypeObjectUtils::build_common_struct_member(member_id_array_bool_field, member_flags_array_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_bool_field, common_array_bool_field_ec))}; if (!common_array_bool_field_ec) @@ -6302,7 +6416,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum_field = 0x0000002a; + MemberId member_id_array_enum_field = 0x0000002b; bool common_array_enum_field_ec {false}; CommonStructMember common_array_enum_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum_field, member_flags_array_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum_field, common_array_enum_field_ec))}; if (!common_array_enum_field_ec) @@ -6364,7 +6478,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_enum2_field = 0x0000002b; + MemberId member_id_array_enum2_field = 0x0000002c; bool common_array_enum2_field_ec {false}; CommonStructMember common_array_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_array_enum2_field, member_flags_array_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_enum2_field, common_array_enum2_field_ec))}; if (!common_array_enum2_field_ec) @@ -6426,7 +6540,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_array_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_array_struct_field = 0x0000002c; + MemberId member_id_array_struct_field = 0x0000002d; bool common_array_struct_field_ec {false}; CommonStructMember common_array_struct_field {TypeObjectUtils::build_common_struct_member(member_id_array_struct_field, member_flags_array_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_array_struct_field, common_array_struct_field_ec))}; if (!common_array_struct_field_ec) @@ -6488,7 +6602,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_char_field = 0x0000002d; + MemberId member_id_bounded_sequence_char_field = 0x0000002e; bool common_bounded_sequence_char_field_ec {false}; CommonStructMember common_bounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_char_field, member_flags_bounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_char_field, common_bounded_sequence_char_field_ec))}; if (!common_bounded_sequence_char_field_ec) @@ -6550,7 +6664,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint8_field = 0x0000002e; + MemberId member_id_bounded_sequence_uint8_field = 0x0000002f; bool common_bounded_sequence_uint8_field_ec {false}; CommonStructMember common_bounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint8_field, member_flags_bounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint8_field, common_bounded_sequence_uint8_field_ec))}; if (!common_bounded_sequence_uint8_field_ec) @@ -6612,7 +6726,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int16_field = 0x0000002f; + MemberId member_id_bounded_sequence_int16_field = 0x00000030; bool common_bounded_sequence_int16_field_ec {false}; CommonStructMember common_bounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int16_field, member_flags_bounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int16_field, common_bounded_sequence_int16_field_ec))}; if (!common_bounded_sequence_int16_field_ec) @@ -6674,7 +6788,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint16_field = 0x00000030; + MemberId member_id_bounded_sequence_uint16_field = 0x00000031; bool common_bounded_sequence_uint16_field_ec {false}; CommonStructMember common_bounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint16_field, member_flags_bounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint16_field, common_bounded_sequence_uint16_field_ec))}; if (!common_bounded_sequence_uint16_field_ec) @@ -6736,7 +6850,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int32_field = 0x00000031; + MemberId member_id_bounded_sequence_int32_field = 0x00000032; bool common_bounded_sequence_int32_field_ec {false}; CommonStructMember common_bounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int32_field, member_flags_bounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int32_field, common_bounded_sequence_int32_field_ec))}; if (!common_bounded_sequence_int32_field_ec) @@ -6798,7 +6912,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint32_field = 0x00000032; + MemberId member_id_bounded_sequence_uint32_field = 0x00000033; bool common_bounded_sequence_uint32_field_ec {false}; CommonStructMember common_bounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint32_field, member_flags_bounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint32_field, common_bounded_sequence_uint32_field_ec))}; if (!common_bounded_sequence_uint32_field_ec) @@ -6860,7 +6974,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_int64_field = 0x00000033; + MemberId member_id_bounded_sequence_int64_field = 0x00000034; bool common_bounded_sequence_int64_field_ec {false}; CommonStructMember common_bounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_int64_field, member_flags_bounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_int64_field, common_bounded_sequence_int64_field_ec))}; if (!common_bounded_sequence_int64_field_ec) @@ -6922,7 +7036,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_uint64_field = 0x00000034; + MemberId member_id_bounded_sequence_uint64_field = 0x00000035; bool common_bounded_sequence_uint64_field_ec {false}; CommonStructMember common_bounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_uint64_field, member_flags_bounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_uint64_field, common_bounded_sequence_uint64_field_ec))}; if (!common_bounded_sequence_uint64_field_ec) @@ -6984,7 +7098,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_float_field = 0x00000035; + MemberId member_id_bounded_sequence_float_field = 0x00000036; bool common_bounded_sequence_float_field_ec {false}; CommonStructMember common_bounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_float_field, member_flags_bounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_float_field, common_bounded_sequence_float_field_ec))}; if (!common_bounded_sequence_float_field_ec) @@ -7046,7 +7160,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_double_field = 0x00000036; + MemberId member_id_bounded_sequence_double_field = 0x00000037; bool common_bounded_sequence_double_field_ec {false}; CommonStructMember common_bounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_double_field, member_flags_bounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_double_field, common_bounded_sequence_double_field_ec))}; if (!common_bounded_sequence_double_field_ec) @@ -7108,7 +7222,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_bool_field = 0x00000037; + MemberId member_id_bounded_sequence_bool_field = 0x00000038; bool common_bounded_sequence_bool_field_ec {false}; CommonStructMember common_bounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_bool_field, member_flags_bounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_bool_field, common_bounded_sequence_bool_field_ec))}; if (!common_bounded_sequence_bool_field_ec) @@ -7168,7 +7282,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum_field = 0x00000038; + MemberId member_id_bounded_sequence_enum_field = 0x00000039; bool common_bounded_sequence_enum_field_ec {false}; CommonStructMember common_bounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum_field, member_flags_bounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum_field, common_bounded_sequence_enum_field_ec))}; if (!common_bounded_sequence_enum_field_ec) @@ -7228,7 +7342,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_enum2_field = 0x00000039; + MemberId member_id_bounded_sequence_enum2_field = 0x0000003a; bool common_bounded_sequence_enum2_field_ec {false}; CommonStructMember common_bounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_enum2_field, member_flags_bounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_enum2_field, common_bounded_sequence_enum2_field_ec))}; if (!common_bounded_sequence_enum2_field_ec) @@ -7288,7 +7402,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_bounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_bounded_sequence_struct_field = 0x0000003a; + MemberId member_id_bounded_sequence_struct_field = 0x0000003b; bool common_bounded_sequence_struct_field_ec {false}; CommonStructMember common_bounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_bounded_sequence_struct_field, member_flags_bounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_bounded_sequence_struct_field, common_bounded_sequence_struct_field_ec))}; if (!common_bounded_sequence_struct_field_ec) @@ -7350,7 +7464,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_char_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_char_field = 0x0000003b; + MemberId member_id_unbounded_sequence_char_field = 0x0000003c; bool common_unbounded_sequence_char_field_ec {false}; CommonStructMember common_unbounded_sequence_char_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_char_field, member_flags_unbounded_sequence_char_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_char_field, common_unbounded_sequence_char_field_ec))}; if (!common_unbounded_sequence_char_field_ec) @@ -7412,7 +7526,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint8_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint8_field = 0x0000003c; + MemberId member_id_unbounded_sequence_uint8_field = 0x0000003d; bool common_unbounded_sequence_uint8_field_ec {false}; CommonStructMember common_unbounded_sequence_uint8_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint8_field, member_flags_unbounded_sequence_uint8_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint8_field, common_unbounded_sequence_uint8_field_ec))}; if (!common_unbounded_sequence_uint8_field_ec) @@ -7474,7 +7588,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int16_field = 0x0000003d; + MemberId member_id_unbounded_sequence_int16_field = 0x0000003e; bool common_unbounded_sequence_int16_field_ec {false}; CommonStructMember common_unbounded_sequence_int16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int16_field, member_flags_unbounded_sequence_int16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int16_field, common_unbounded_sequence_int16_field_ec))}; if (!common_unbounded_sequence_int16_field_ec) @@ -7536,7 +7650,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint16_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint16_field = 0x0000003e; + MemberId member_id_unbounded_sequence_uint16_field = 0x0000003f; bool common_unbounded_sequence_uint16_field_ec {false}; CommonStructMember common_unbounded_sequence_uint16_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint16_field, member_flags_unbounded_sequence_uint16_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint16_field, common_unbounded_sequence_uint16_field_ec))}; if (!common_unbounded_sequence_uint16_field_ec) @@ -7598,7 +7712,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int32_field = 0x0000003f; + MemberId member_id_unbounded_sequence_int32_field = 0x00000040; bool common_unbounded_sequence_int32_field_ec {false}; CommonStructMember common_unbounded_sequence_int32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int32_field, member_flags_unbounded_sequence_int32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int32_field, common_unbounded_sequence_int32_field_ec))}; if (!common_unbounded_sequence_int32_field_ec) @@ -7660,7 +7774,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint32_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint32_field = 0x00000040; + MemberId member_id_unbounded_sequence_uint32_field = 0x00000041; bool common_unbounded_sequence_uint32_field_ec {false}; CommonStructMember common_unbounded_sequence_uint32_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint32_field, member_flags_unbounded_sequence_uint32_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint32_field, common_unbounded_sequence_uint32_field_ec))}; if (!common_unbounded_sequence_uint32_field_ec) @@ -7722,7 +7836,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_int64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_int64_field = 0x00000041; + MemberId member_id_unbounded_sequence_int64_field = 0x00000042; bool common_unbounded_sequence_int64_field_ec {false}; CommonStructMember common_unbounded_sequence_int64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_int64_field, member_flags_unbounded_sequence_int64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_int64_field, common_unbounded_sequence_int64_field_ec))}; if (!common_unbounded_sequence_int64_field_ec) @@ -7784,7 +7898,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_uint64_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_uint64_field = 0x00000042; + MemberId member_id_unbounded_sequence_uint64_field = 0x00000043; bool common_unbounded_sequence_uint64_field_ec {false}; CommonStructMember common_unbounded_sequence_uint64_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_uint64_field, member_flags_unbounded_sequence_uint64_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_uint64_field, common_unbounded_sequence_uint64_field_ec))}; if (!common_unbounded_sequence_uint64_field_ec) @@ -7846,7 +7960,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_float_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_float_field = 0x00000043; + MemberId member_id_unbounded_sequence_float_field = 0x00000044; bool common_unbounded_sequence_float_field_ec {false}; CommonStructMember common_unbounded_sequence_float_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_float_field, member_flags_unbounded_sequence_float_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_float_field, common_unbounded_sequence_float_field_ec))}; if (!common_unbounded_sequence_float_field_ec) @@ -7908,7 +8022,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_double_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_double_field = 0x00000044; + MemberId member_id_unbounded_sequence_double_field = 0x00000045; bool common_unbounded_sequence_double_field_ec {false}; CommonStructMember common_unbounded_sequence_double_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_double_field, member_flags_unbounded_sequence_double_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_double_field, common_unbounded_sequence_double_field_ec))}; if (!common_unbounded_sequence_double_field_ec) @@ -7970,7 +8084,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_bool_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_bool_field = 0x00000045; + MemberId member_id_unbounded_sequence_bool_field = 0x00000046; bool common_unbounded_sequence_bool_field_ec {false}; CommonStructMember common_unbounded_sequence_bool_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_bool_field, member_flags_unbounded_sequence_bool_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_bool_field, common_unbounded_sequence_bool_field_ec))}; if (!common_unbounded_sequence_bool_field_ec) @@ -8030,7 +8144,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum_field = 0x00000046; + MemberId member_id_unbounded_sequence_enum_field = 0x00000047; bool common_unbounded_sequence_enum_field_ec {false}; CommonStructMember common_unbounded_sequence_enum_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum_field, member_flags_unbounded_sequence_enum_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum_field, common_unbounded_sequence_enum_field_ec))}; if (!common_unbounded_sequence_enum_field_ec) @@ -8090,7 +8204,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_enum2_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_enum2_field = 0x00000047; + MemberId member_id_unbounded_sequence_enum2_field = 0x00000048; bool common_unbounded_sequence_enum2_field_ec {false}; CommonStructMember common_unbounded_sequence_enum2_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_enum2_field, member_flags_unbounded_sequence_enum2_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_enum2_field, common_unbounded_sequence_enum2_field_ec))}; if (!common_unbounded_sequence_enum2_field_ec) @@ -8150,7 +8264,7 @@ void register_KeyedCompleteTestType_type_identifier( } StructMemberFlag member_flags_unbounded_sequence_struct_field = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD, false, false, false, false); - MemberId member_id_unbounded_sequence_struct_field = 0x00000048; + MemberId member_id_unbounded_sequence_struct_field = 0x00000049; bool common_unbounded_sequence_struct_field_ec {false}; CommonStructMember common_unbounded_sequence_struct_field {TypeObjectUtils::build_common_struct_member(member_id_unbounded_sequence_struct_field, member_flags_unbounded_sequence_struct_field, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_unbounded_sequence_struct_field, common_unbounded_sequence_struct_field_ec))}; if (!common_unbounded_sequence_struct_field_ec) From 3e9f706521db36db83b94d597efc8138f781b944 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Mon, 24 Feb 2025 12:38:35 +0100 Subject: [PATCH 07/10] Refs #22835. Fix issue. Signed-off-by: Miguel Company --- fastdds_python/test/api/test_datareader.py | 8 +++++--- fastdds_python/test/types/test_complete.i | 5 ++--- fastdds_python/test/types/test_modules.i | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fastdds_python/test/api/test_datareader.py b/fastdds_python/test/api/test_datareader.py index 9b8ef56e..1409829b 100644 --- a/fastdds_python/test/api/test_datareader.py +++ b/fastdds_python/test/api/test_datareader.py @@ -165,7 +165,8 @@ def fill_keyed_complete_test_type(data): data.double_field(1202.5) data.bool_field(True) data.string_field("Test string") - data.fixed_string_field("Fixed string") + fixed_string = pytest.dds_type.fixed_string_16("Fixed string") + data.fixed_string_field(fixed_string) data.enum_field(pytest.dds_type.Color_MAGENTA) data.enum2_field(pytest.dds_type.Material_METAL) data.struct_field().char_field('\x01') @@ -180,7 +181,7 @@ def fill_keyed_complete_test_type(data): data.struct_field().double_field(1202.5) data.struct_field().bool_field(False) data.struct_field().string_field("Test string") - data.struct_field().fixed_string_field("Fixed string") + data.struct_field().fixed_string_field(fixed_string) data.struct_field().enum_field(pytest.dds_type.Color_MAGENTA) data.struct_field().enum2_field(pytest.dds_type.Material_METAL) data.char_opt_field().set_value('\x01') @@ -209,7 +210,8 @@ def fill_keyed_complete_test_type(data): struct_field.double_field(1202.5) struct_field.bool_field(True) struct_field.string_field("Test string") - struct_field.fixed_string_field("Fixed string") + fixed_string = pytest.dds_type.fixed_string_16("Fixed string") + struct_field.fixed_string_field(fixed_string) struct_field.enum_field(pytest.dds_type.Color_MAGENTA) struct_field.enum2_field(pytest.dds_type.Material_METAL) data.struct_opt_field().set_value(struct_field) diff --git a/fastdds_python/test/types/test_complete.i b/fastdds_python/test/types/test_complete.i index 012096cc..077db443 100644 --- a/fastdds_python/test/types/test_complete.i +++ b/fastdds_python/test/types/test_complete.i @@ -56,6 +56,7 @@ %include %import(module="fastdds") "fastcdr/xcdr/optional.hpp" +%import(module="fastdds") "fastcdr/cdr/fixed_size_string.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableCollection.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableTypedCollection.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableSequence.hpp" @@ -214,7 +215,7 @@ namespace swig { %ignore StructType::string_field(); %rename("%s") StructType::string_field() const; - +%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>; %ignore StructType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&); @@ -225,8 +226,6 @@ namespace swig { %ignore StructType::fixed_string_field(); %rename("%s") StructType::fixed_string_field() const; - - %ignore StructType::enum_field(Color&&); diff --git a/fastdds_python/test/types/test_modules.i b/fastdds_python/test/types/test_modules.i index cc3c53d6..67e9f0b3 100644 --- a/fastdds_python/test/types/test_modules.i +++ b/fastdds_python/test/types/test_modules.i @@ -55,6 +55,7 @@ %include %import(module="fastdds") "fastcdr/xcdr/optional.hpp" +%import(module="fastdds") "fastcdr/cdr/fixed_size_string.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableCollection.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableTypedCollection.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableSequence.hpp" @@ -73,6 +74,8 @@ namespace swig { %traits_penumn(enum eprosima::test::Color); %traits_penumn(enum eprosima::test::Material); +%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>; + //////////////////////////////////////////////////////// // Binding for class eprosima::test::StructType //////////////////////////////////////////////////////// From ac68daf5f2d17373436229d69973a1d065e32a09 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Mon, 24 Feb 2025 15:00:47 +0100 Subject: [PATCH 08/10] Refs #22835. Alternative solution. Signed-off-by: Miguel Company --- fastdds_python/test/api/test_datareader.py | 8 +++----- fastdds_python/test/types/test_complete.i | 22 +++++++++++++++++++++ fastdds_python/test/types/test_modules.i | 23 +++++++++++++++++++++- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/fastdds_python/test/api/test_datareader.py b/fastdds_python/test/api/test_datareader.py index 1409829b..9b8ef56e 100644 --- a/fastdds_python/test/api/test_datareader.py +++ b/fastdds_python/test/api/test_datareader.py @@ -165,8 +165,7 @@ def fill_keyed_complete_test_type(data): data.double_field(1202.5) data.bool_field(True) data.string_field("Test string") - fixed_string = pytest.dds_type.fixed_string_16("Fixed string") - data.fixed_string_field(fixed_string) + data.fixed_string_field("Fixed string") data.enum_field(pytest.dds_type.Color_MAGENTA) data.enum2_field(pytest.dds_type.Material_METAL) data.struct_field().char_field('\x01') @@ -181,7 +180,7 @@ def fill_keyed_complete_test_type(data): data.struct_field().double_field(1202.5) data.struct_field().bool_field(False) data.struct_field().string_field("Test string") - data.struct_field().fixed_string_field(fixed_string) + data.struct_field().fixed_string_field("Fixed string") data.struct_field().enum_field(pytest.dds_type.Color_MAGENTA) data.struct_field().enum2_field(pytest.dds_type.Material_METAL) data.char_opt_field().set_value('\x01') @@ -210,8 +209,7 @@ def fill_keyed_complete_test_type(data): struct_field.double_field(1202.5) struct_field.bool_field(True) struct_field.string_field("Test string") - fixed_string = pytest.dds_type.fixed_string_16("Fixed string") - struct_field.fixed_string_field(fixed_string) + struct_field.fixed_string_field("Fixed string") struct_field.enum_field(pytest.dds_type.Color_MAGENTA) struct_field.enum2_field(pytest.dds_type.Material_METAL) data.struct_opt_field().set_value(struct_field) diff --git a/fastdds_python/test/types/test_complete.i b/fastdds_python/test/types/test_complete.i index 077db443..b71811b7 100644 --- a/fastdds_python/test/types/test_complete.i +++ b/fastdds_python/test/types/test_complete.i @@ -226,6 +226,14 @@ namespace swig { %ignore StructType::fixed_string_field(); %rename("%s") StructType::fixed_string_field() const; +%extend StructType { + void fixed_string_field(const std::string& value) + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } +} + %ignore StructType::enum_field(Color&&); @@ -425,6 +433,13 @@ namespace swig { %ignore CompleteTestType::fixed_string_field(); %rename("%s") CompleteTestType::fixed_string_field() const; +%extend CompleteTestType { + void fixed_string_field(const std::string& value) + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } +} %ignore CompleteTestType::enum_field(Color&&); @@ -1670,6 +1685,13 @@ namespace swig { %ignore KeyedCompleteTestType::fixed_string_field(); %rename("%s") KeyedCompleteTestType::fixed_string_field() const; +%extend KeyedCompleteTestType { + void fixed_string_field(const std::string& value) + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } +} %ignore KeyedCompleteTestType::enum_field(Color&&); diff --git a/fastdds_python/test/types/test_modules.i b/fastdds_python/test/types/test_modules.i index 67e9f0b3..42124e8a 100644 --- a/fastdds_python/test/types/test_modules.i +++ b/fastdds_python/test/types/test_modules.i @@ -227,7 +227,13 @@ namespace swig { %ignore eprosima::test::StructType::fixed_string_field(); %rename("%s") eprosima::test::StructType::fixed_string_field() const; - +%extend eprosima::test::StructType { + void fixed_string_field(const std::string& value) + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } +} %ignore eprosima::test::StructType::enum_field(eprosima::test::Color&&); @@ -417,6 +423,13 @@ namespace swig { %ignore eprosima::test::CompleteTestType::fixed_string_field(); %rename("%s") eprosima::test::CompleteTestType::fixed_string_field() const; +%extend eprosima::test::CompleteTestType { + void fixed_string_field(const std::string& value) + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } +} %ignore eprosima::test::CompleteTestType::enum_field(eprosima::test::Color&&); @@ -1663,6 +1676,14 @@ namespace swig { %rename("%s") eprosima::test::KeyedCompleteTestType::fixed_string_field() const; +%extend eprosima::test::KeyedCompleteTestType { + void fixed_string_field(const std::string& value) + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } +} + %ignore eprosima::test::KeyedCompleteTestType::enum_field(eprosima::test::Color&&); From 89cfa775a12146c1856af7a01d49c9ef6ecb66f1 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Mon, 24 Feb 2025 16:18:24 +0100 Subject: [PATCH 09/10] Refs #22835. Test both approaches. Signed-off-by: Miguel Company --- fastdds_python/test/api/test_datareader.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fastdds_python/test/api/test_datareader.py b/fastdds_python/test/api/test_datareader.py index 9b8ef56e..cb596073 100644 --- a/fastdds_python/test/api/test_datareader.py +++ b/fastdds_python/test/api/test_datareader.py @@ -165,7 +165,8 @@ def fill_keyed_complete_test_type(data): data.double_field(1202.5) data.bool_field(True) data.string_field("Test string") - data.fixed_string_field("Fixed string") + fixed_string = pytest.dds_type.fixed_string_16("Fixed string") + data.fixed_string_field(fixed_string) data.enum_field(pytest.dds_type.Color_MAGENTA) data.enum2_field(pytest.dds_type.Material_METAL) data.struct_field().char_field('\x01') From 4cdc1c584c2ee5a751d13cee7b76c68014a1c2ae Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Mon, 24 Feb 2025 16:22:13 +0100 Subject: [PATCH 10/10] Refs #22835. Regenerate code with Fast DDS Gen. Signed-off-by: Miguel Company --- fastdds_python/test/types/test_complete.i | 42 +++++++++++------- .../test/types/test_included_modules.i | 1 + fastdds_python/test/types/test_modules.i | 43 +++++++++++-------- 3 files changed, 52 insertions(+), 34 deletions(-) diff --git a/fastdds_python/test/types/test_complete.i b/fastdds_python/test/types/test_complete.i index b71811b7..b6a8be16 100644 --- a/fastdds_python/test/types/test_complete.i +++ b/fastdds_python/test/types/test_complete.i @@ -215,7 +215,7 @@ namespace swig { %ignore StructType::string_field(); %rename("%s") StructType::string_field() const; -%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>; + %ignore StructType::fixed_string_field(eprosima::fastcdr::fixed_string<16>&&); @@ -226,14 +226,18 @@ namespace swig { %ignore StructType::fixed_string_field(); %rename("%s") StructType::fixed_string_field() const; -%extend StructType { +%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>; +%extend StructType +{ void fixed_string_field(const std::string& value) - { - eprosima::fastcdr::fixed_string<16> tmp(value); - $self->fixed_string_field(tmp); - } + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } } + + %ignore StructType::enum_field(Color&&); @@ -433,15 +437,18 @@ namespace swig { %ignore CompleteTestType::fixed_string_field(); %rename("%s") CompleteTestType::fixed_string_field() const; -%extend CompleteTestType { +%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>; +%extend CompleteTestType +{ void fixed_string_field(const std::string& value) - { - eprosima::fastcdr::fixed_string<16> tmp(value); - $self->fixed_string_field(tmp); - } + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } } + %ignore CompleteTestType::enum_field(Color&&); @@ -1685,15 +1692,18 @@ namespace swig { %ignore KeyedCompleteTestType::fixed_string_field(); %rename("%s") KeyedCompleteTestType::fixed_string_field() const; -%extend KeyedCompleteTestType { +%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>; +%extend KeyedCompleteTestType +{ void fixed_string_field(const std::string& value) - { - eprosima::fastcdr::fixed_string<16> tmp(value); - $self->fixed_string_field(tmp); - } + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } } + %ignore KeyedCompleteTestType::enum_field(Color&&); diff --git a/fastdds_python/test/types/test_included_modules.i b/fastdds_python/test/types/test_included_modules.i index 82aac3f6..d6ee901b 100644 --- a/fastdds_python/test/types/test_included_modules.i +++ b/fastdds_python/test/types/test_included_modules.i @@ -55,6 +55,7 @@ %include %import(module="fastdds") "fastcdr/xcdr/optional.hpp" +%import(module="fastdds") "fastcdr/cdr/fixed_size_string.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableCollection.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableTypedCollection.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableSequence.hpp" diff --git a/fastdds_python/test/types/test_modules.i b/fastdds_python/test/types/test_modules.i index 42124e8a..79dadcc1 100644 --- a/fastdds_python/test/types/test_modules.i +++ b/fastdds_python/test/types/test_modules.i @@ -74,8 +74,6 @@ namespace swig { %traits_penumn(enum eprosima::test::Color); %traits_penumn(enum eprosima::test::Material); -%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>; - //////////////////////////////////////////////////////// // Binding for class eprosima::test::StructType //////////////////////////////////////////////////////// @@ -227,14 +225,18 @@ namespace swig { %ignore eprosima::test::StructType::fixed_string_field(); %rename("%s") eprosima::test::StructType::fixed_string_field() const; -%extend eprosima::test::StructType { +%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>; +%extend eprosima::test::StructType +{ void fixed_string_field(const std::string& value) - { - eprosima::fastcdr::fixed_string<16> tmp(value); - $self->fixed_string_field(tmp); - } + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } } + + %ignore eprosima::test::StructType::enum_field(eprosima::test::Color&&); @@ -423,15 +425,18 @@ namespace swig { %ignore eprosima::test::CompleteTestType::fixed_string_field(); %rename("%s") eprosima::test::CompleteTestType::fixed_string_field() const; -%extend eprosima::test::CompleteTestType { +%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>; +%extend eprosima::test::CompleteTestType +{ void fixed_string_field(const std::string& value) - { - eprosima::fastcdr::fixed_string<16> tmp(value); - $self->fixed_string_field(tmp); - } + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } } + %ignore eprosima::test::CompleteTestType::enum_field(eprosima::test::Color&&); @@ -1675,16 +1680,18 @@ namespace swig { %ignore eprosima::test::KeyedCompleteTestType::fixed_string_field(); %rename("%s") eprosima::test::KeyedCompleteTestType::fixed_string_field() const; - -%extend eprosima::test::KeyedCompleteTestType { +%template(fixed_string_16) eprosima::fastcdr::fixed_string<16>; +%extend eprosima::test::KeyedCompleteTestType +{ void fixed_string_field(const std::string& value) - { - eprosima::fastcdr::fixed_string<16> tmp(value); - $self->fixed_string_field(tmp); - } + { + eprosima::fastcdr::fixed_string<16> tmp(value); + $self->fixed_string_field(tmp); + } } + %ignore eprosima::test::KeyedCompleteTestType::enum_field(eprosima::test::Color&&);