Regenerate types and fix compilation

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
eProsima · Jun 20, 2024 · 726e07f · 726e07f
1 parent 5c755d2
commit 726e07f
Show file tree

Hide file tree

Showing 6 changed files with 1,896 additions and 42,291 deletions.
diff --git a/src/cpp/fastdds/xtypes/utils.cpp b/src/cpp/fastdds/xtypes/utils.cpp
@@ -460,7 +460,7 @@ ReturnCode_t json_serialize_basic_member(
         }
         case TK_BYTE:
         {
-            fastrtps::rtps::octet value;
+            fastdds::rtps::octet value;
             ReturnCode_t ret = data->get_byte_value(value, member_id);
             if (RETCODE_OK == ret)
             {

diff --git a/.../unittest/dds/xtypes/dyndata_json/types/comprehensive_type/common/ComprehensiveCommon.cpp b/.../unittest/dds/xtypes/dyndata_json/types/comprehensive_type/common/ComprehensiveCommon.cpp
@@ -24,6 +24,7 @@
 
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
+#include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/detail/dynamic_language_binding.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
@@ -176,7 +177,9 @@ traits<DynamicType>::ref_type create_dynamic_type<DataTypeKind::COMPREHENSIVE_TY
 {
     const auto type_name = "ComprehensiveType";
 
-    register_ComprehensiveType_type_objects();
+    eprosima::fastdds::dds::TypeSupport type(new ComprehensiveTypePubSubType());
+
+    type->register_type_object_representation();
 
     xtypes::TypeObjectPair type_object_pair;
     if (RETCODE_OK !=

diff --git a/...est/dds/xtypes/dyndata_json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx b/...est/dds/xtypes/dyndata_json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx
@@ -27,8 +27,8 @@
 #include "ComprehensiveTypeCdrAux.hpp"
 #include "ComprehensiveTypeTypeObjectSupport.hpp"
 
-using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t;
-using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t;
+using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t;
+using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t;
 using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;
 
 PrimitivesStructPubSubType::PrimitivesStructPubSubType()
@@ -219,9 +219,9 @@ bool PrimitivesStructPubSubType::getKey(
     return true;
 }
 
-void PrimitivesStructPubSubType::register_type_object_representation() const
+void PrimitivesStructPubSubType::register_type_object_representation()
 {
-    register_ComprehensiveType_type_objects();
+    register_PrimitivesStruct_type_identifier(type_identifiers_);
 }
 
 
@@ -421,9 +421,9 @@ bool AllStructPubSubType::getKey(
     return true;
 }
 
-void AllStructPubSubType::register_type_object_representation() const
+void AllStructPubSubType::register_type_object_representation()
 {
-    register_ComprehensiveType_type_objects();
+    register_AllStruct_type_identifier(type_identifiers_);
 }
 
 ComprehensiveTypePubSubType::ComprehensiveTypePubSubType()
@@ -614,9 +614,9 @@ bool ComprehensiveTypePubSubType::getKey(
     return true;
 }
 
-void ComprehensiveTypePubSubType::register_type_object_representation() const
+void ComprehensiveTypePubSubType::register_type_object_representation()
 {
-    register_ComprehensiveType_type_objects();
+    register_ComprehensiveType_type_identifier(type_identifiers_);
 }
 
 

diff --git a/...ttest/dds/xtypes/dyndata_json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.h b/...ttest/dds/xtypes/dyndata_json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.h
@@ -54,18 +54,18 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
     eProsima_user_DllExport bool serialize(
             void* data,
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
     {
         return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
     }
 
     eProsima_user_DllExport bool serialize(
             void* data,
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
     eProsima_user_DllExport bool deserialize(
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
             void* data) override;
 
     eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
@@ -80,7 +80,7 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
     eProsima_user_DllExport bool getKey(
             void* data,
-            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
             bool force_md5 = false) override;
 
     eProsima_user_DllExport void* createData() override;
@@ -89,7 +89,7 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType
             void* data) override;
 
     //Register TypeObject representation in Fast DDS TypeObjectRegistry
-    eProsima_user_DllExport void register_type_object_representation() const override;
+    eProsima_user_DllExport void register_type_object_representation() override;
 
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
     eProsima_user_DllExport inline bool is_bounded() const override
@@ -154,18 +154,18 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
     eProsima_user_DllExport bool serialize(
             void* data,
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
     {
         return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
     }
 
     eProsima_user_DllExport bool serialize(
             void* data,
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
     eProsima_user_DllExport bool deserialize(
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
             void* data) override;
 
     eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
@@ -180,7 +180,7 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
     eProsima_user_DllExport bool getKey(
             void* data,
-            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
             bool force_md5 = false) override;
 
     eProsima_user_DllExport void* createData() override;
@@ -189,7 +189,7 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType
             void* data) override;
 
     //Register TypeObject representation in Fast DDS TypeObjectRegistry
-    eProsima_user_DllExport void register_type_object_representation() const override;
+    eProsima_user_DllExport void register_type_object_representation() override;
 
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
     eProsima_user_DllExport inline bool is_bounded() const override
@@ -245,18 +245,18 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
     eProsima_user_DllExport bool serialize(
             void* data,
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
     {
         return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
     }
 
     eProsima_user_DllExport bool serialize(
             void* data,
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
     eProsima_user_DllExport bool deserialize(
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
             void* data) override;
 
     eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
@@ -271,7 +271,7 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
     eProsima_user_DllExport bool getKey(
             void* data,
-            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
             bool force_md5 = false) override;
 
     eProsima_user_DllExport void* createData() override;
@@ -280,7 +280,7 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType
             void* data) override;
 
     //Register TypeObject representation in Fast DDS TypeObjectRegistry
-    eProsima_user_DllExport void register_type_object_representation() const override;
+    eProsima_user_DllExport void register_type_object_representation() override;
 
 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
     eProsima_user_DllExport inline bool is_bounded() const override