Regenerate types with Fast DDS-Gen v4 (#172)

* Refs #21368: Regenerate shape types with Gen v4 Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21368: Regenerate keyless shape types with Gen v4 Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21368: Add ROS2 mangling to keyless shape types Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
eProsima · Aug 27, 2024 · 3d236a1 · 3d236a1
1 parent ffefb63
commit 3d236a1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/types/KeylessShapeTypeCdrAux.ipp b/types/KeylessShapeTypeCdrAux.ipp
@@ -139,6 +139,14 @@ void serialize_key(
 
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.color();
+
+                        scdr << data.x();
+
+                        scdr << data.y();
+
+                        scdr << data.shapesize();
+
 }
 
 

diff --git a/types/KeylessShapeTypePubSubTypes.cxx b/types/KeylessShapeTypePubSubTypes.cxx
@@ -35,7 +35,7 @@ namespace shapes_demo_typesupport {
     namespace idl {
         KeylessShapeTypePubSubType::KeylessShapeTypePubSubType()
         {
-            set_name("shapes_demo_typesupport::idl::KeylessShapeType");
+            set_name("shapes_demo_typesupport::idl::dds_::KeylessShapeType_");
             uint32_t type_size = shapes_demo_typesupport_idl_KeylessShapeType_max_cdr_typesize;
             type_size += static_cast<uint32_t>(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */
             max_serialized_type_size = type_size + 4; /*encapsulation*/
@@ -186,7 +186,8 @@ namespace shapes_demo_typesupport {
                     shapes_demo_typesupport_idl_KeylessShapeType_max_key_cdr_typesize);
 
             // Object that serializes the data.
-            eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+            eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+            ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
             eprosima::fastcdr::serialize_key(ser, *p_type);
             if (force_md5 || shapes_demo_typesupport_idl_KeylessShapeType_max_key_cdr_typesize > 16)
             {

diff --git a/types/ShapeCdrAux.ipp b/types/ShapeCdrAux.ipp
@@ -129,9 +129,10 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const ShapeType& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
-                            scdr << data.color();
+                        scdr << data.color();
 
 
 

diff --git a/types/ShapePubSubTypes.cxx b/types/ShapePubSubTypes.cxx
@@ -184,7 +184,8 @@ bool ShapeTypePubSubType::compute_key(
             ShapeType_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || ShapeType_max_key_cdr_typesize > 16)
     {