Update types with Fast DDS Gen 4.0.4 (#217)

Mario-DL · web-flow · commit f905f47e792a · 2025-03-20T15:58:34.000+01:00
Signed-off-by: Mario Dominguez &lt;mariodominguez@eprosima.com&gt;
diff --git a/fastdds_python/test/types/test_complete.i b/fastdds_python/test/types/test_complete.i
@@ -56,6 +56,7 @@
 
 %include <fastcdr/config.h>
 %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"
@@ -264,8 +265,6 @@ namespace swig {
     }
 }
 
-
-
 ////////////////////////////////////////////////////////
 // Binding for class CompleteTestType
 ////////////////////////////////////////////////////////
diff --git 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
@@ -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
@@ -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
@@ -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_modules.i b/fastdds_python/test/types/test_included_modules.i
@@ -54,7 +54,7 @@
 %}
 
 %include <fastcdr/config.h>
-%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_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_modules.i b/fastdds_python/test/types/test_modules.i
@@ -55,6 +55,7 @@
 
 %include <fastcdr/config.h>
 %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"
@@ -252,8 +253,6 @@ namespace swig {
     }
 }
 
-
-
 ////////////////////////////////////////////////////////
 // Binding for class eprosima::test::CompleteTestType
 ////////////////////////////////////////////////////////
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/HelloWorld.i b/fastdds_python_examples/HelloWorldExample/HelloWorld.i
@@ -54,7 +54,7 @@
 %}
 
 %include <fastcdr/config.h>
-%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_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*/)
     {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@`
`56`	`56`
`57`	`57`	`%include <fastcdr/config.h>`
`58`	`58`	`%import(module="fastdds") "fastcdr/xcdr/optional.hpp"`
	`59`	`+%import(module="fastdds") "fastcdr/cdr/fixed_size_string.hpp"`
`59`	`60`	`%import(module="fastdds") "fastdds/dds/core/LoanableCollection.hpp"`
`60`	`61`	`%import(module="fastdds") "fastdds/dds/core/LoanableTypedCollection.hpp"`
`61`	`62`	`%import(module="fastdds") "fastdds/dds/core/LoanableSequence.hpp"`
`@@ -264,8 +265,6 @@ namespace swig {`
`264`	`265`	`}`
`265`	`266`	`}`
`266`	`267`
`267`		`-`
`268`		`-`
`269`	`268`	`////////////////////////////////////////////////////////`
`270`	`269`	`// Binding for class CompleteTestType`
`271`	`270`	`////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -257,8 +257,6 @@ void serialize_key(`
`257`	`257`	`}`
`258`	`258`
`259`	`259`
`260`		`-`
`261`		`-`
`262`	`260`	`template<>`
`263`	`261`	`eProsima_user_DllExport size_t calculate_serialized_size(`
`264`	`262`	`eprosima::fastcdr::CdrSizeCalculator& calculator,`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ bool StructTypePubSubType::serialize(`
`76`	`76`	`ser.serialize_encapsulation();`
`77`	`77`	`// Serialize the object.`
`78`	`78`	`ser << *p_type;`
	`79`	`+ ser.set_dds_cdr_options({0,0});`
`79`	`80`	`}`
`80`	`81`	`catch (eprosima::fastcdr::exception::Exception& /exception/)`
`81`	`82`	`{`
`@@ -212,8 +213,6 @@ void StructTypePubSubType::register_type_object_representation()`
`212`	`213`	`register_StructType_type_identifier(type_identifiers_);`
`213`	`214`	`}`
`214`	`215`
`215`		`-`
`216`		`-`
`217`	`216`	`CompleteTestTypePubSubType::CompleteTestTypePubSubType()`
`218`	`217`	`{`
`219`	`218`	`set_name("CompleteTestType");`
`@@ -259,6 +258,7 @@ bool CompleteTestTypePubSubType::serialize(`
`259`	`258`	`ser.serialize_encapsulation();`
`260`	`259`	`// Serialize the object.`
`261`	`260`	`ser << *p_type;`
	`261`	`+ ser.set_dds_cdr_options({0,0});`
`262`	`262`	`}`
`263`	`263`	`catch (eprosima::fastcdr::exception::Exception& /exception/)`
`264`	`264`	`{`
`@@ -440,6 +440,7 @@ bool KeyedCompleteTestTypePubSubType::serialize(`
`440`	`440`	`ser.serialize_encapsulation();`
`441`	`441`	`// Serialize the object.`
`442`	`442`	`ser << *p_type;`
	`443`	`+ ser.set_dds_cdr_options({0,0});`
`443`	`444`	`}`
`444`	`445`	`catch (eprosima::fastcdr::exception::Exception& /exception/)`
`445`	`446`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ namespace eprosima {`
`78`	`78`	`ser.serialize_encapsulation();`
`79`	`79`	`// Serialize the object.`
`80`	`80`	`ser << *p_type;`
	`81`	`+ ser.set_dds_cdr_options({0,0});`
`81`	`82`	`}`
`82`	`83`	`catch (eprosima::fastcdr::exception::Exception& /exception/)`
`83`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@`
`55`	`55`
`56`	`56`	`%include <fastcdr/config.h>`
`57`	`57`	`%import(module="fastdds") "fastcdr/xcdr/optional.hpp"`
	`58`	`+%import(module="fastdds") "fastcdr/cdr/fixed_size_string.hpp"`
`58`	`59`	`%import(module="fastdds") "fastdds/dds/core/LoanableCollection.hpp"`
`59`	`60`	`%import(module="fastdds") "fastdds/dds/core/LoanableTypedCollection.hpp"`
`60`	`61`	`%import(module="fastdds") "fastdds/dds/core/LoanableSequence.hpp"`
`@@ -252,8 +253,6 @@ namespace swig {`
`252`	`253`	`}`
`253`	`254`	`}`
`254`	`255`
`255`		`-`
`256`		`-`
`257`	`256`	`////////////////////////////////////////////////////////`
`258`	`257`	`// Binding for class eprosima::test::CompleteTestType`
`259`	`258`	`////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,6 @@ void serialize_key(`
`250`	`250`	`}`
`251`	`251`
`252`	`252`
`253`		`-`
`254`		`-`
`255`	`253`	`template<>`
`256`	`254`	`eProsima_user_DllExport size_t calculate_serialized_size(`
`257`	`255`	`eprosima::fastcdr::CdrSizeCalculator& calculator,`