Regenerate types with Fast DDS Gen 3.3.2 (#1209)

Signed-off-by: Emilio Cuesta <emiliocuesta@eprosima.com>

Author: emiliocuestaf

code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx

@@ -16,7 +16,7 @@
  * @file HelloWorld.cpp
  * This source file contains the implementation of the described types in the IDL file.
  *
- * This file was generated by the tool fastddsgen.
+ * This file was generated by the tool fastddsgen (version: 3.3.2).
  */
 
 #ifdef _WIN32
@@ -28,8 +28,6 @@ char dummy;
 
 #include "HelloWorld.h"
 
-#if FASTCDR_VERSION_MAJOR > 1
-
 #include <fastcdr/Cdr.h>
 
 
@@ -165,4 +163,3 @@ std::string& HelloWorld::message()
 // Include auxiliary functions like for serializing/deserializing.
 #include "HelloWorldCdrAux.ipp"
 
-#endif // FASTCDR_VERSION_MAJOR > 1

code/Examples/C++/DDSHelloWorld/src/HelloWorld.h

@@ -16,14 +16,9 @@
  * @file HelloWorld.h
  * This header file contains the declaration of the described types in the IDL file.
  *
- * This file was generated by the tool fastddsgen.
+ * This file was generated by the tool fastddsgen (version: 3.3.2).
  */
 
-#include <fastcdr/config.h>
-#include "HelloWorldv1.h"
-
-#if FASTCDR_VERSION_MAJOR > 1
-
 #ifndef _FAST_DDS_GENERATED_HELLOWORLD_H_
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
@@ -192,4 +187,3 @@ class HelloWorld
 
 
 
-#endif // FASTCDR_VERSION_MAJOR > 1

code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.hpp

@@ -16,7 +16,7 @@
  * @file HelloWorldCdrAux.hpp
  * This source file contains some definitions of CDR related functions.
  *
- * This file was generated by the tool fastddsgen.
+ * This file was generated by the tool fastddsgen (version: 3.3.2).
  */
 
 #ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_

code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.ipp

@@ -16,7 +16,7 @@
  * @file HelloWorldCdrAux.ipp
  * This source file contains some declarations of CDR related functions.
  *
- * This file was generated by the tool fastddsgen.
+ * This file was generated by the tool fastddsgen (version: 3.3.2).
  */
 
 #ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_

code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx

@@ -16,10 +16,13 @@
  * @file HelloWorldPubSubTypes.cpp
  * This header file contains the implementation of the serialization functions.
  *
- * This file was generated by the tool fastddsgen.
+ * This file was generated by the tool fastddsgen (version: 3.3.2).
  */
 
 
+#include <algorithm>
+#include <mutex>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
 
 #include "HelloWorldPubSubTypes.h"
@@ -43,25 +46,19 @@ HelloWorldPubSubType::HelloWorldPubSubType()
     type_size += static_cast<uint32_t>(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */
     m_typeSize = type_size + 4; /*encapsulation*/
     m_isGetKeyDefined = false;
-    uint32_t keyLength = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16;
-    m_keyBuffer = reinterpret_cast<unsigned char*>(malloc(keyLength));
-    memset(m_keyBuffer, 0, keyLength);
 }
 
 HelloWorldPubSubType::~HelloWorldPubSubType()
 {
-    if (m_keyBuffer != nullptr)
-    {
-        free(m_keyBuffer);
-    }
 }
 
 bool HelloWorldPubSubType::serialize(
         void* data,
         SerializedPayload_t* payload,
         DataRepresentationId_t data_representation)
 {
-    HelloWorld* p_type = static_cast<HelloWorld*>(data);
+    HelloWorld* p_type =
+            static_cast<HelloWorld*>(data);
 
     // Object that manages the raw buffer.
     eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char*>(payload->data), payload->max_size);
@@ -84,7 +81,7 @@ bool HelloWorldPubSubType::serialize(
         // Serialize the object.
         ser << *p_type;
 #if FASTCDR_VERSION_MAJOR > 1
-        ser.set_dds_cdr_options({0,0});
+        ser.set_dds_cdr_options({0, 0});
 #else
         ser.setDDSCdrOptions(0);
 #endif // FASTCDR_VERSION_MAJOR > 1
@@ -110,7 +107,8 @@ bool HelloWorldPubSubType::deserialize(
     try
     {
         // Convert DATA to pointer of your type
-        HelloWorld* p_type = static_cast<HelloWorld*>(data);
+        HelloWorld* p_type =
+		        static_cast<HelloWorld*>(data);
 
         // Object that manages the raw buffer.
         eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char*>(payload->data), payload->length);
@@ -182,45 +180,11 @@ bool HelloWorldPubSubType::getKey(
         InstanceHandle_t* handle,
         bool force_md5)
 {
-    if (!m_isGetKeyDefined)
-    {
-        return false;
-    }
+    static_cast<void>(data);
+    static_cast<void>(handle);
+    static_cast<void>(force_md5);
 
-    HelloWorld* p_type = static_cast<HelloWorld*>(data);
-
-    // Object that manages the raw buffer.
-    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char*>(m_keyBuffer),
-            HelloWorld_max_key_cdr_typesize);
-
-    // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
-#if FASTCDR_VERSION_MAJOR == 1
-    p_type->serializeKey(ser);
-#else
-    eprosima::fastcdr::serialize_key(ser, *p_type);
-#endif // FASTCDR_VERSION_MAJOR == 1
-    if (force_md5 || HelloWorld_max_key_cdr_typesize > 16)
-    {
-        m_md5.init();
-#if FASTCDR_VERSION_MAJOR == 1
-        m_md5.update(m_keyBuffer, static_cast<unsigned int>(ser.getSerializedDataLength()));
-#else
-        m_md5.update(m_keyBuffer, static_cast<unsigned int>(ser.get_serialized_data_length()));
-#endif // FASTCDR_VERSION_MAJOR == 1
-        m_md5.finalize();
-        for (uint8_t i = 0; i < 16; ++i)
-        {
-            handle->value[i] = m_md5.digest[i];
-        }
-    }
-    else
-    {
-        for (uint8_t i = 0; i < 16; ++i)
-        {
-            handle->value[i] = m_keyBuffer[i];
-        }
-    }
-    return true;
+    return false;
 }
 
+

code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h

@@ -16,13 +16,15 @@
  * @file HelloWorldPubSubTypes.h
  * This header file contains the declaration of the serialization functions.
  *
- * This file was generated by the tool fastddsgen.
+ * This file was generated by the tool fastddsgen (version: 3.3.2).
  */
 
 
 #ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
 #define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
 
+#include <mutex>
+
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
@@ -123,9 +125,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
-    unsigned char* m_keyBuffer;
-
 };
 
 #endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_