From fd9a11b3de455641078c3e337ad04b08edd6ee3c Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Wed, 18 Dec 2024 14:48:07 +0100 Subject: [PATCH] Refs #22497: Regenerate types with Fast DDS Gen 4.0.3 Signed-off-by: Mario Dominguez --- fastdds_python/test/types/test_completeCdrAux.hpp | 2 -- fastdds_python/test/types/test_completeCdrAux.ipp | 2 -- fastdds_python/test/types/test_completePubSubTypes.cxx | 5 +++-- fastdds_python/test/types/test_completePubSubTypes.hpp | 2 -- .../test/types/test_included_modulesPubSubTypes.cxx | 1 + fastdds_python/test/types/test_modulesCdrAux.hpp | 2 -- fastdds_python/test/types/test_modulesCdrAux.ipp | 2 -- fastdds_python/test/types/test_modulesPubSubTypes.cxx | 5 +++-- fastdds_python/test/types/test_modulesPubSubTypes.hpp | 2 -- fastdds_python/test/types/test_modulesTypeObjectSupport.hpp | 2 -- .../HelloWorldExample/HelloWorldPubSubTypes.cxx | 1 + 11 files changed, 8 insertions(+), 18 deletions(-) diff --git a/fastdds_python/test/types/test_completeCdrAux.hpp b/fastdds_python/test/types/test_completeCdrAux.hpp index 2a36c469..577bf239 100644 --- a/fastdds_python/test/types/test_completeCdrAux.hpp +++ b/fastdds_python/test/types/test_completeCdrAux.hpp @@ -49,8 +49,6 @@ eProsima_user_DllExport void serialize_key( eprosima::fastcdr::Cdr& scdr, const StructType& data); - - eProsima_user_DllExport void serialize_key( eprosima::fastcdr::Cdr& scdr, const CompleteTestType& data); diff --git a/fastdds_python/test/types/test_completeCdrAux.ipp b/fastdds_python/test/types/test_completeCdrAux.ipp index 3d86a41c..64da7892 100644 --- a/fastdds_python/test/types/test_completeCdrAux.ipp +++ b/fastdds_python/test/types/test_completeCdrAux.ipp @@ -257,8 +257,6 @@ void serialize_key( } - - template<> eProsima_user_DllExport size_t calculate_serialized_size( eprosima::fastcdr::CdrSizeCalculator& calculator, diff --git a/fastdds_python/test/types/test_completePubSubTypes.cxx b/fastdds_python/test/types/test_completePubSubTypes.cxx index 3801713e..7db70d89 100644 --- a/fastdds_python/test/types/test_completePubSubTypes.cxx +++ b/fastdds_python/test/types/test_completePubSubTypes.cxx @@ -76,6 +76,7 @@ bool StructTypePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + ser.set_dds_cdr_options({0,0}); } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -212,8 +213,6 @@ void StructTypePubSubType::register_type_object_representation() register_StructType_type_identifier(type_identifiers_); } - - CompleteTestTypePubSubType::CompleteTestTypePubSubType() { set_name("CompleteTestType"); @@ -259,6 +258,7 @@ bool CompleteTestTypePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + ser.set_dds_cdr_options({0,0}); } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -440,6 +440,7 @@ bool KeyedCompleteTestTypePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + ser.set_dds_cdr_options({0,0}); } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/fastdds_python/test/types/test_completePubSubTypes.hpp b/fastdds_python/test/types/test_completePubSubTypes.hpp index 52a4004c..de6e8f8e 100644 --- a/fastdds_python/test/types/test_completePubSubTypes.hpp +++ b/fastdds_python/test/types/test_completePubSubTypes.hpp @@ -120,8 +120,6 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType }; - - /*! * @brief This class represents the TopicDataType of the type CompleteTestType defined by the user in the IDL file. * @ingroup test_complete diff --git a/fastdds_python/test/types/test_included_modulesPubSubTypes.cxx b/fastdds_python/test/types/test_included_modulesPubSubTypes.cxx index a7559e7e..7aa02323 100644 --- a/fastdds_python/test/types/test_included_modulesPubSubTypes.cxx +++ b/fastdds_python/test/types/test_included_modulesPubSubTypes.cxx @@ -78,6 +78,7 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + ser.set_dds_cdr_options({0,0}); } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/fastdds_python/test/types/test_modulesCdrAux.hpp b/fastdds_python/test/types/test_modulesCdrAux.hpp index f451676e..c9e196a2 100644 --- a/fastdds_python/test/types/test_modulesCdrAux.hpp +++ b/fastdds_python/test/types/test_modulesCdrAux.hpp @@ -45,8 +45,6 @@ eProsima_user_DllExport void serialize_key( eprosima::fastcdr::Cdr& scdr, const eprosima::test::StructType& data); - - eProsima_user_DllExport void serialize_key( eprosima::fastcdr::Cdr& scdr, const eprosima::test::CompleteTestType& data); diff --git a/fastdds_python/test/types/test_modulesCdrAux.ipp b/fastdds_python/test/types/test_modulesCdrAux.ipp index 1024feac..a22314d9 100644 --- a/fastdds_python/test/types/test_modulesCdrAux.ipp +++ b/fastdds_python/test/types/test_modulesCdrAux.ipp @@ -250,8 +250,6 @@ void serialize_key( } - - template<> eProsima_user_DllExport size_t calculate_serialized_size( eprosima::fastcdr::CdrSizeCalculator& calculator, diff --git a/fastdds_python/test/types/test_modulesPubSubTypes.cxx b/fastdds_python/test/types/test_modulesPubSubTypes.cxx index 297004fb..afd6f3ad 100644 --- a/fastdds_python/test/types/test_modulesPubSubTypes.cxx +++ b/fastdds_python/test/types/test_modulesPubSubTypes.cxx @@ -78,6 +78,7 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + ser.set_dds_cdr_options({0,0}); } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -214,8 +215,6 @@ namespace eprosima { register_StructType_type_identifier(type_identifiers_); } - - CompleteTestTypePubSubType::CompleteTestTypePubSubType() { set_name("eprosima::test::CompleteTestType"); @@ -261,6 +260,7 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + ser.set_dds_cdr_options({0,0}); } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -442,6 +442,7 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + ser.set_dds_cdr_options({0,0}); } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/fastdds_python/test/types/test_modulesPubSubTypes.hpp b/fastdds_python/test/types/test_modulesPubSubTypes.hpp index 2201e6af..3a49f5ba 100644 --- a/fastdds_python/test/types/test_modulesPubSubTypes.hpp +++ b/fastdds_python/test/types/test_modulesPubSubTypes.hpp @@ -123,8 +123,6 @@ namespace eprosima }; - - /*! * @brief This class represents the TopicDataType of the type CompleteTestType defined by the user in the IDL file. * @ingroup test_modules diff --git a/fastdds_python/test/types/test_modulesTypeObjectSupport.hpp b/fastdds_python/test/types/test_modulesTypeObjectSupport.hpp index 53407201..15fc6778 100644 --- a/fastdds_python/test/types/test_modulesTypeObjectSupport.hpp +++ b/fastdds_python/test/types/test_modulesTypeObjectSupport.hpp @@ -78,8 +78,6 @@ eProsima_user_DllExport void register_Material_type_identifier( eProsima_user_DllExport void register_StructType_type_identifier( eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids); - - /** * @brief Register CompleteTestType related TypeIdentifier. * Fully-descriptive TypeIdentifiers are directly registered. diff --git a/fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.cxx b/fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.cxx index 865410fd..deb6bb76 100644 --- a/fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.cxx +++ b/fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.cxx @@ -76,6 +76,7 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + ser.set_dds_cdr_options({0,0}); } catch (eprosima::fastcdr::exception::Exception& /*exception*/) {