Refs #21044. Regeneration of code

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · May 27, 2024 · 83e3470 · 83e3470
1 parent 1938763
commit 83e3470
Show file tree

Hide file tree

Showing 72 changed files with 815 additions and 1,724 deletions.
diff --git a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.cxx b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool AdvancedConfigurationPubSubType::getKey(
 
 void AdvancedConfigurationPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_AdvancedConfiguration_type_identifier(type_ids);
+    register_AdvancedConfiguration_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool HelloWorldPubSubType::getKey(
 
 void HelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_HelloWorld_type_identifier(type_ids);
+    register_HelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/Configurability/samplePubSubTypes.cxx b/examples/cpp/dds/Configurability/samplePubSubTypes.cxx
@@ -221,8 +221,7 @@ bool samplePubSubType::getKey(
 
 void samplePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_sample_type_identifier(type_ids);
+    register_sample_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool HelloWorldPubSubType::getKey(
 
 void HelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_HelloWorld_type_identifier(type_ids);
+    register_HelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.cxx b/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool TopicPubSubType::getKey(
 
 void TopicPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_Topic_type_identifier(type_ids);
+    register_Topic_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.cxx b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool CustomPayloadPoolDataPubSubType::getKey(
 
 void CustomPayloadPoolDataPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_CustomPayloadPoolData_type_identifier(type_ids);
+    register_CustomPayloadPoolData_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.cxx b/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool HelloMsgPubSubType::getKey(
 
 void HelloMsgPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_HelloMsg_type_identifier(type_ids);
+    register_HelloMsg_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.cxx b/examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool TopicPubSubType::getKey(
 
 void TopicPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_Topic_type_identifier(type_ids);
+    register_Topic_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool HelloWorldPubSubType::getKey(
 
 void HelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_HelloWorld_type_identifier(type_ids);
+    register_HelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.cxx b/examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.cxx
@@ -221,8 +221,7 @@ bool FilteringExamplePubSubType::getKey(
 
 void FilteringExamplePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_FilteringExample_type_identifier(type_ids);
+    register_FilteringExample_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx
@@ -221,8 +221,7 @@ bool FlowControlExamplePubSubType::getKey(
 
 void FlowControlExamplePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_FlowControlExample_type_identifier(type_ids);
+    register_FlowControlExample_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool HelloWorldPubSubType::getKey(
 
 void HelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_HelloWorld_type_identifier(type_ids);
+    register_HelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool HelloWorldPubSubType::getKey(
 
 void HelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_HelloWorld_type_identifier(type_ids);
+    register_HelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool HelloWorldPubSubType::getKey(
 
 void HelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_HelloWorld_type_identifier(type_ids);
+    register_HelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool HelloWorldPubSubType::getKey(
 
 void HelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_HelloWorld_type_identifier(type_ids);
+    register_HelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/HistoryKind/samplePubSubTypes.cxx b/examples/cpp/dds/HistoryKind/samplePubSubTypes.cxx
@@ -221,8 +221,7 @@ bool samplePubSubType::getKey(
 
 void samplePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_sample_type_identifier(type_ids);
+    register_sample_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.cxx b/examples/cpp/dds/Keys/samplePubSubTypes.cxx
@@ -221,8 +221,7 @@ bool samplePubSubType::getKey(
 
 void samplePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_sample_type_identifier(type_ids);
+    register_sample_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/LateJoiners/samplePubSubTypes.cxx b/examples/cpp/dds/LateJoiners/samplePubSubTypes.cxx
@@ -221,8 +221,7 @@ bool samplePubSubType::getKey(
 
 void samplePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_sample_type_identifier(type_ids);
+    register_sample_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.cxx b/examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool LifespanPubSubType::getKey(
 
 void LifespanPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_Lifespan_type_identifier(type_ids);
+    register_Lifespan_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.cxx b/examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool TopicPubSubType::getKey(
 
 void TopicPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_Topic_type_identifier(type_ids);
+    register_Topic_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.cxx b/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool ExampleMessagePubSubType::getKey(
 
 void ExampleMessagePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_ExampleMessage_type_identifier(type_ids);
+    register_ExampleMessage_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool RequestTypePubSubType::getKey(
 
 void RequestTypePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_RequestType_type_identifier(type_ids);
+    register_RequestType_type_identifier(type_identifiers_);
 }
 
 ReplyTypePubSubType::ReplyTypePubSubType()
@@ -415,8 +414,7 @@ bool ReplyTypePubSubType::getKey(
 
 void ReplyTypePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_ReplyType_type_identifier(type_ids);
+    register_ReplyType_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.cxx b/examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.cxx
@@ -221,8 +221,7 @@ bool samplePubSubType::getKey(
 
 void samplePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_sample_type_identifier(type_ids);
+    register_sample_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.cxx b/examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.cxx
@@ -221,8 +221,7 @@ bool samplePubSubType::getKey(
 
 void samplePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_sample_type_identifier(type_ids);
+    register_sample_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.cxx b/examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.cxx
@@ -221,8 +221,7 @@ bool samplePubSubType::getKey(
 
 void samplePubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_sample_type_identifier(type_ids);
+    register_sample_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool HelloWorldPubSubType::getKey(
 
 void HelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_HelloWorld_type_identifier(type_ids);
+    register_HelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool HelloWorldPubSubType::getKey(
 
 void HelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_HelloWorld_type_identifier(type_ids);
+    register_HelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool LoanableHelloWorldPubSubType::getKey(
 
 void LoanableHelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_LoanableHelloWorld_type_identifier(type_ids);
+    register_LoanableHelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx
@@ -221,8 +221,7 @@ bool LoanableHelloWorldPubSubType::getKey(
 
 void LoanableHelloWorldPubSubType::register_type_object_representation()
 {
-    eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-    register_LoanableHelloWorld_type_identifier(type_ids);
+    register_LoanableHelloWorld_type_identifier(type_identifiers_);
 }
 
 

diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp
@@ -204,35 +204,13 @@ class TopicDataType
     }
 
     /**
-     * Get the type information
+     * Get the type identifiers
      *
-     * @return @ref xtypes::TypeInformation
+     * @return @ref xtypes::TypeIdentifierPair
      */
-    FASTDDS_EXPORTED_API inline const xtypes::TypeInformation& type_information() const
+    FASTDDS_EXPORTED_API inline const xtypes::TypeIdentifierPair& type_identifiers() const
     {
-        return type_information_;
-    }
-
-    /**
-     * Set type information
-     *
-     * @param info @ref xtypes::TypeInformation
-     */
-    FASTDDS_EXPORTED_API inline void type_information(
-            const xtypes::TypeInformation& info)
-    {
-        type_information_ = info;
-    }
-
-    /**
-     * Set type information
-     *
-     * @param info @ref xtypes::TypeInformation
-     */
-    FASTDDS_EXPORTED_API inline void type_information(
-            xtypes::TypeInformation&& info)
-    {
-        type_information_ = std::move(info);
+        return type_identifiers_;
     }
 
     /**
@@ -290,7 +268,7 @@ class TopicDataType
 
 protected:
 
-    xtypes::TypeInformation type_information_;
+    xtypes::TypeIdentifierPair type_identifiers_;
 
 private:
 

diff --git a/include/fastdds/dds/topic/TypeSupport.hpp b/include/fastdds/dds/topic/TypeSupport.hpp
@@ -239,7 +239,7 @@ class TypeSupport : public std::shared_ptr<TopicDataType>
         return get()->m_typeSize == type_support->m_typeSize
                && get()->m_isGetKeyDefined == type_support->m_isGetKeyDefined
                && get()->m_topicDataTypeName == type_support->m_topicDataTypeName
-               && get()->type_information() == type_support->type_information();
+               && get()->type_identifiers_ == type_support->type_identifiers_;
     }
 
     /**

diff --git a/include/fastdds/rtps/attributes/TopicAttributes.h b/include/fastdds/rtps/attributes/TopicAttributes.h
@@ -43,7 +43,6 @@ class TopicAttributes
         : topicKind(rtps::NO_KEY)
         , topicName("UNDEF")
         , topicDataType("UNDEF")
-        , auto_fill_type_information(true)
     {
     }
 
@@ -56,7 +55,6 @@ class TopicAttributes
         topicKind = tKind;
         topicName = name;
         topicDataType = dataType;
-        auto_fill_type_information = true;
     }
 
     virtual ~TopicAttributes()
@@ -115,8 +113,6 @@ class TopicAttributes
     TypeObjectV1 type;
     //!XTYPES 1.2
     xtypes::TypeInformationParameter type_information;
-    //!Tries to complete type information (TypeObjectV2)
-    bool auto_fill_type_information;
 
     /**
      * Method to check whether the defined QOS are correct.